From 62b36ab57b27295c3a993bc067d892283a03130f Mon Sep 17 00:00:00 2001 From: Brian Frost Date: Wed, 18 Oct 2023 11:12:27 -0400 Subject: [PATCH] Change tag grep to look for release tag format (cherry picked from commit 6caed45bc5437872c275ad250d65ad6b675d2d1e) --- .github/workflows/trigger-tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-tag.yml b/.github/workflows/trigger-tag.yml index 68f785792..63d4d2ab6 100644 --- a/.github/workflows/trigger-tag.yml +++ b/.github/workflows/trigger-tag.yml @@ -24,7 +24,7 @@ jobs: # and 2022.1.1-dev9 will become 2022.1.1-dev10 - name: Get next dev tag name run: | - LAST_TAG=$(git tag --sort=v:refname --merged ${{ env.BRANCH_NAME }} | grep -e '-dev' | tail -1) + LAST_TAG=$(git tag --sort=v:refname --merged ${{ env.BRANCH_NAME }} | grep -E '^[0-9]{4}\.[0-9]+\.[0-9]+-dev[0-9]+$' | tail -1) echo "NEXT_TAG=$(echo $LAST_TAG | awk -F-dev -v OFS=-dev '{$NF += 1 ; print}')" >> $GITHUB_ENV # Trigger the build - name: Trigger the tagger workflow with branch ${{env.BRANCH_NAME}} and tag ${{ env.NEXT_TAG }}