From 4f258623ff835cd2312894e884b7ac138d76754d Mon Sep 17 00:00:00 2001 From: Hassan Baker Date: Fri, 24 Oct 2025 15:24:48 +0100 Subject: [PATCH 1/5] test tag on merge --- .../{fmt:check.yml => fmt-check.yml} | 0 .../{scan:trivy.yml => scan-trivy.yml} | 0 .github/workflows/tag-bump.yml | 20 +++++++++++++++++++ .../{test:lambda.yaml => test-lambda.yaml} | 0 4 files changed, 20 insertions(+) rename .github/workflows/{fmt:check.yml => fmt-check.yml} (100%) rename .github/workflows/{scan:trivy.yml => scan-trivy.yml} (100%) create mode 100644 .github/workflows/tag-bump.yml rename .github/workflows/{test:lambda.yaml => test-lambda.yaml} (100%) diff --git a/.github/workflows/fmt:check.yml b/.github/workflows/fmt-check.yml similarity index 100% rename from .github/workflows/fmt:check.yml rename to .github/workflows/fmt-check.yml diff --git a/.github/workflows/scan:trivy.yml b/.github/workflows/scan-trivy.yml similarity index 100% rename from .github/workflows/scan:trivy.yml rename to .github/workflows/scan-trivy.yml diff --git a/.github/workflows/tag-bump.yml b/.github/workflows/tag-bump.yml new file mode 100644 index 0000000..347d6ae --- /dev/null +++ b/.github/workflows/tag-bump.yml @@ -0,0 +1,20 @@ +name: Bump version +on: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-22.04 + permissions: + contents: write + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: '0' + + - name: Bump version and push tag + uses: anothrNick/github-tag-action@1.75.0 + env: + DRY_RUN: true diff --git a/.github/workflows/test:lambda.yaml b/.github/workflows/test-lambda.yaml similarity index 100% rename from .github/workflows/test:lambda.yaml rename to .github/workflows/test-lambda.yaml From 5b55986283af85f632bf9660be98e86b47d22a61 Mon Sep 17 00:00:00 2001 From: Hassan Baker Date: Fri, 24 Oct 2025 15:27:23 +0100 Subject: [PATCH 2/5] run on branch --- .github/workflows/tag-bump.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-bump.yml b/.github/workflows/tag-bump.yml index 347d6ae..e4cf198 100644 --- a/.github/workflows/tag-bump.yml +++ b/.github/workflows/tag-bump.yml @@ -2,7 +2,7 @@ name: Bump version on: push: branches: - - master + - hbaker/tag-on-merge jobs: build: From e009f4d654328a113615b470b6664c8de9491b1e Mon Sep 17 00:00:00 2001 From: Hassan Baker Date: Fri, 24 Oct 2025 15:30:59 +0100 Subject: [PATCH 3/5] run --- .github/workflows/tag-bump.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-bump.yml b/.github/workflows/tag-bump.yml index e4cf198..ee4544d 100644 --- a/.github/workflows/tag-bump.yml +++ b/.github/workflows/tag-bump.yml @@ -17,4 +17,4 @@ jobs: - name: Bump version and push tag uses: anothrNick/github-tag-action@1.75.0 env: - DRY_RUN: true + TAG_PREFIX: 'v' From 798c1a09afc53902feb9304b6f291bd21c87f7b6 Mon Sep 17 00:00:00 2001 From: Hassan Baker Date: Fri, 24 Oct 2025 15:32:49 +0100 Subject: [PATCH 4/5] use pat --- .github/workflows/tag-bump.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tag-bump.yml b/.github/workflows/tag-bump.yml index ee4544d..8375e6b 100644 --- a/.github/workflows/tag-bump.yml +++ b/.github/workflows/tag-bump.yml @@ -18,3 +18,4 @@ jobs: uses: anothrNick/github-tag-action@1.75.0 env: TAG_PREFIX: 'v' + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 232beec3f17252ec07d282feaab0e46d6267aad5 Mon Sep 17 00:00:00 2001 From: Hassan Baker Date: Fri, 24 Oct 2025 15:36:43 +0100 Subject: [PATCH 5/5] cleanup --- .github/workflows/tag-bump.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tag-bump.yml b/.github/workflows/tag-bump.yml index 8375e6b..b1810a3 100644 --- a/.github/workflows/tag-bump.yml +++ b/.github/workflows/tag-bump.yml @@ -1,17 +1,21 @@ name: Bump version on: - push: + pull_request: + types: + - closed branches: - - hbaker/tag-on-merge + - master jobs: build: + if: github.event.pull_request.merged == true runs-on: ubuntu-22.04 permissions: contents: write steps: - uses: actions/checkout@v4 with: + ref: ${{ github.event.pull_request.merge_commit_sha }} fetch-depth: '0' - name: Bump version and push tag