Merge pull request #1502 from xiaoyifang/staged

cut a release, really
xiaoyifang · May 5, 2024 · ecd1138 · ecd1138
2 parents 1ca8ae5 + 2021fd9
commit ecd1138
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/.github/workflows/macos-homebrew-breakpad.yml b/.github/workflows/macos-homebrew-breakpad.yml
@@ -26,7 +26,7 @@ jobs:
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 24.02.16
+      version: 24.05.05
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml
@@ -27,7 +27,7 @@ jobs:
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 24.02.16
+      version: 24.05.05
       version-suffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'LiXia' }}
       prerelease: ${{ !contains(github.ref_name,'master') }}
     steps:
@@ -81,12 +81,23 @@ jobs:
           cmake --install build_dir/
       - name: changelog
         id: changelog
+        env:
+          prerelease: ${{env.prerelease}}
         run: |
-          previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p)
-          echo "previousTag : $previousTag"
-          
+          if [[ "$prerelease" == 'true' ]]
+          then
+            echo "This is a pre-release"
+            previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p)
+            currentTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)
+          else 
+            echo "This is not a pre-release"
+            previousTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha"  | sed -n 2p)
+            currentTag=$(git tag --sort=-creatordate | grep "^v"  | grep -v "alpha" | sed -n 1p)
+          fi
           echo "prev_tag=$previousTag" >> $GITHUB_OUTPUT
-          echo "curr_tag=$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)" >> $GITHUB_OUTPUT
+          echo "curr_tag=$currentTag" >> $GITHUB_OUTPUT
+          echo "previousTag : $previousTag"
+          echo "currentTag : $currentTag"
 
       - name: Set outputs
         id: vars

diff --git a/.github/workflows/windows-6.x.yml b/.github/workflows/windows-6.x.yml
@@ -56,12 +56,23 @@ jobs:
       - name: changelog
         id: changelog
         shell: bash
+        env:
+          prerelease: ${{env.prerelease}}
         run: |   
-          previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p)
-          echo "previousTag : $previousTag"
-          
+          if [[ "$prerelease" == 'true' ]]
+          then
+            echo "This is a pre-release"
+            previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p)
+            currentTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)
+          else 
+            echo "This is not a pre-release"
+            previousTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha"  | sed -n 2p)
+            currentTag=$(git tag --sort=-creatordate | grep "^v"  | grep -v "alpha" | sed -n 1p)
+          fi
           echo "prev_tag=$previousTag" >> $GITHUB_OUTPUT
-          echo "curr_tag=$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)" >> $GITHUB_OUTPUT
+          echo "curr_tag=$currentTag" >> $GITHUB_OUTPUT
+          echo "previousTag : $previousTag"
+          echo "currentTag : $currentTag"
 
       - name: "Build Changelog"
         id: build_changelog