Merge pull request #1675 from contour-terminal/release

Prepare release 0.6.0
contour-terminal · Dec 26, 2024 · 6d1f087 · 6d1f087
2 parents 96a01b6 + c8231f0
commit 6d1f087
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -540,7 +540,7 @@ jobs:
           # cmake --build build --target package-verbose
           # ls -hl build/
           # find build/src/contour/contour.app -print
-          BASENAME="contour-${{ steps.set_vars.outputs.version }}-macOS-x86
+          BASENAME="contour-${{ steps.set_vars.outputs.version }}-macOS-x86"
           mv -vf "build/Contour-${{ steps.set_vars.outputs.VERSION_STRING }}-Darwin.dmg" "${BASENAME}.dmg"
       - name: upload to artifact store (DMG)
         uses: actions/upload-artifact@v4
@@ -1238,10 +1238,8 @@ jobs:
           files: |
             *.deb
             *.ddeb
-            *.rpm
             *.dmg
             *.msi
-            *.zst
             *.zip
             *.AppImage
   # }}}
diff --git a/metainfo.xml b/metainfo.xml
@@ -104,7 +104,7 @@
 
     -->
 
-    <release version="0.5.2" urgency="medium" type="development">
+    <release version="0.6.0" urgency="medium" date="2024-12-26">
       <description>
         <ul>
           <li>Fixes search editor preservation bug on exit from search mode</li>

diff --git a/src/contour/Config.cpp b/src/contour/Config.cpp
@@ -2131,7 +2131,30 @@ std::string createForProfile(Config const& c)
             doc.append(writer.process(writer.whichDoc(v), name, v.value()));
         };
 
+    // Something is wrong for vtpty::Process::ExecInfo formating for static build
+    // we add this lambda to handle it in overload set for now
+    auto const processConfigEntryWithExecInfo =
+        [&]<documentation::StringLiteral ConfigDoc, documentation::StringLiteral WebDoc>(
+            auto name,
+            contour::config::ConfigEntry<
+                vtpty::Process::ExecInfo,
+                contour::config::documentation::DocumentationEntry<ConfigDoc, WebDoc>> const& vEntry) {
+            auto v = vEntry.value();
+            auto args = std::string { "[" };
+            args.append(v.arguments | ::ranges::views::join(", ") | ::ranges::to<std::string>);
+            args.append("]");
+
+            doc.append(writer.process(writer.whichDoc(vEntry), name, v.program, args, [&]() -> std::string {
+                auto fromConfig = v.workingDirectory.string();
+                if (fromConfig.empty()
+                    || fromConfig == crispy::homeResolvedPath("~", vtpty::Process::homeDirectory()))
+                    return std::string { "\"~\"" };
+                return fromConfig;
+            }()));
+        };
+
     auto completeOverload = crispy::overloaded {
+        processConfigEntryWithExecInfo,
         processConfigEntry,
         [&]([[maybe_unused]] auto name, [[maybe_unused]] auto const& v) {},
     };

diff --git a/src/contour/Config.h b/src/contour/Config.h
@@ -1131,7 +1131,7 @@ struct Writer
         return format(doc, v.count());
     }
 
-    [[nodiscard]] std::string format(std::string_view doc, vtpty::Process::ExecInfo const& v)
+    [[nodiscard]] std::string format(std::string_view doc, vtpty::Process::ExecInfo v)
     {
         auto args = std::string { "[" };
         args.append(v.arguments | ranges::views::join(", ") | ranges::to<std::string>);