fix: CE 1124 (#705)

bcgov · Oct 16, 2024 · d86e33e · d86e33e
1 parent 46d6c1d
commit d86e33e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/pr-version-bump.yml b/.github/workflows/pr-version-bump.yml
@@ -20,7 +20,7 @@ jobs:
         id: get_latest_tag
         run: |
           git fetch origin main --tags
-          latest_tag=$(git describe --tags --abbrev=0 origin/main)
+          latest_tag=$(git tag --list --sort=-v:refname --merged | head -n 1)
           echo "::set-output name=latest_tag::$latest_tag"
           echo "Latest tag: $latest_tag"
 

diff --git a/.github/workflows/release-branch-creation.yml b/.github/workflows/release-branch-creation.yml
@@ -20,7 +20,7 @@ jobs:
         id: latest_tag
         run: |
           git fetch --tags
-          latest_tag=$(git tag --sort=-creatordate | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | head -n 1)
+          latest_tag=$(git tag --list --sort=-v:refname --merged | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | head -n 1)
           if [ -z "$latest_tag" ]; then
             echo "No previous tags found, starting with v0.1.0"
             latest_tag="v0.0.0"