Merge branch 'release/noble-sea-lemon' into chore/CE-749-no-complaint…

…s-message
bcgov · Oct 21, 2024 · 6849806 · 6849806
2 parents a774ee8 + 4f34914
commit 6849806
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/pr-version-bump.yml b/.github/workflows/pr-version-bump.yml
@@ -12,14 +12,18 @@ jobs:
     if: ${{ github.event.pull_request.merged == true }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Fetch all tags
         run: git fetch --tags --force
 
       - name: Fetch tags from main
         id: get_latest_tag
         run: |
-          git fetch origin main --tags
+          git fetch origin main --tags --force
           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
@@ -11,6 +11,10 @@ jobs:
     if: startsWith(github.ref, 'refs/heads/release/') && !contains(github.ref, '/')
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Install npm
         run: sudo apt-get install -y npm
@@ -19,7 +23,7 @@ jobs:
       - name: Fetch latest tag
         id: latest_tag
         run: |
-          git fetch --tags
+          git fetch --tags --force
           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"