hide git hash for stable releases.

ra3xdh · Aug 26, 2024 · 7a42df0 · 7a42df0
1 parent 4f8a7aa
commit 7a42df0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -33,11 +33,11 @@ jobs:
       id: read_version
       run: |
         if [ "${{github.ref_type}}" == "tag" ]; then
-          VERSION=$(cat VERSION)
+          VERSION=${{ github.ref_name }}
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "version=$VERSION" >> $GITHUB_OUTPUT
         else
-          VERSION=${{env.CI_VERSION}}
+          VERSION=${{ env.CI_VERSION }}
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "version=$VERSION" >> $GITHUB_OUTPUT
         fi

diff --git a/qucs/misc.cpp b/qucs/misc.cpp
@@ -41,14 +41,16 @@
 
 QString misc::getWindowTitle()
 {
-    QString title = QUCS_NAME " " PACKAGE_VERSION;
+    QString title = QString("%1 %2").arg(QUCS_NAME,PACKAGE_VERSION);
     if (title.endsWith(".0")) {
         title.chop(2);
     }
-#if defined(GIT)
-    QString hash = GIT;
-    if (!hash.isEmpty()) {
-        title = title + "-" + hash;
+#if defined(GIT) && defined(CI_VERSION)
+    if (title.endsWith(".99")) {
+        QString hash = GIT;
+        if (!hash.isEmpty()) {
+            title.append("-").append(hash);
+        }
     }
 #endif