Merge pull request #95 from MrAnno/fix-versionsh

scripts: stricter tag matching in version.sh
axoflow · May 17, 2024 · 620ac3d · 620ac3d
2 parents 839b1d5 + 64c5b58
commit 620ac3d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -7,7 +7,7 @@ on:
 
 
 jobs:
-  create-source-tarball:
+  tarball:
     runs-on: ubuntu-latest
     outputs:
       snapshot-version: ${{ steps.snapshot-version.outputs.SNAPSHOT_VERSION }}
@@ -39,7 +39,7 @@ jobs:
           path: dbld/build/*.tar.*
 
   # create-packages:
-  #   needs: create-source-tarball
+  #   needs: tarball
   #   uses: ./.github/workflows/create-packages.yml
   #   with:
   #     source-tarball-artifact-name: source-tarball
@@ -90,7 +90,7 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     needs:
-      - create-source-tarball
+      - tarball
       - axosyslog-modules
     steps:
       - name: Checkout source
@@ -129,7 +129,7 @@ jobs:
   publish-image:
     if: github.ref == 'refs/heads/main'
     uses: ./.github/workflows/axosyslog-docker.yml
-    needs: [create-source-tarball, build-and-test, axosyslog-modules]
+    needs: [tarball, build-and-test, axosyslog-modules]
     with:
       pkg-type: nightly
       tarball-artifact: source-tarball

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -29,7 +29,7 @@ cd $BASEDIR/../
 
 if [ "$VERSION" != "" ]; then
   echo $VERSION | tr -d '\n'
-elif [ -d .git ] && GIT_VERSION=$(git describe --tags --dirty --abbrev=7); then
+elif [ -d .git ] && GIT_VERSION=$(git describe --match 'axosyslog-[0-9]*' --tags --dirty --abbrev=7); then
   echo $GIT_VERSION | sed 's/^axosyslog-//' | tr '-' '.' | tr -d '\n'
 else
   cat VERSION.txt | tr -d '\n'