fix: make git describe find the right tag with multiple choices

* this should make sure git can find the right tag regardless of tag type or date ordering Signed-off-by: Steve Arnold <[email protected]>
sarnold · Mar 23, 2024 · af0ea97 · af0ea97
1 parent 5fcb6cd
commit af0ea97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,7 +33,7 @@ jobs:
         if: matrix.os == 'ubuntu-22.04'
         id: get_version
         run: |
-          echo "VERSION=$(git describe --abbrev=0 --tags)" >> $GITHUB_ENV
+          echo "VERSION=$(git describe --abbrev=0 --tags --match 1*)" >> $GITHUB_ENV
           echo ${{ env.VERSION }}
 
       - name: Unset version

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Get version
         id: get_version
         run: |
-          echo "VERSION=$(git describe --abbrev=0 --tags)" >> $GITHUB_ENV
+          echo "VERSION=$(git describe --abbrev=0 --tags --match 1*)" >> $GITHUB_ENV
           echo ${{ env.VERSION }}
 
       - name: gitchangelog action step (debug)