From facbf22c21773a55b1fe7fe223ce8c7364b0f01e Mon Sep 17 00:00:00 2001 From: Harald Klimach Date: Tue, 20 May 2025 23:56:43 +0200 Subject: [PATCH 1/6] prepend new tag with v --- .github/workflows/tag.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 75dd169..d8b7b0c 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -17,7 +17,7 @@ jobs: permissions: contents: write outputs: - new-tag: ${{ steps.tagbump.outputs.new-tag }} + new-tag: v${{ steps.tagbump.outputs.new-tag }} otag: ${{ steps.tagbump.outputs.tag }} strategy: matrix: @@ -30,11 +30,12 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} branch: main + dry-run: true with-v: true movetags: needs: autotag - #if: ${{ needs.autotag.outputs.new-tag == needs.autotag.outputs.otag }} + if: ${{ needs.autotag.outputs.new-tag != needs.autotag.outputs.otag }} runs-on: ubuntu-latest permissions: contents: write From fe60d23410456df28ea412b35509e48344e1e56a Mon Sep 17 00:00:00 2001 From: Harald Klimach Date: Tue, 20 May 2025 23:58:04 +0200 Subject: [PATCH 2/6] allow tag in non-closed pr --- .github/workflows/tag.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index d8b7b0c..2604b1a 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -3,8 +3,8 @@ name: Bump version on: workflow_dispatch: pull_request: - types: - - closed + #types: + # - closed branches: - main concurrency: From 5561e8fb9c3e2f9030bbfbdaec0178253a03d73d Mon Sep 17 00:00:00 2001 From: Harald Klimach Date: Tue, 20 May 2025 23:59:31 +0200 Subject: [PATCH 3/6] unconditional run --- .github/workflows/tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 2604b1a..31e62df 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -12,7 +12,7 @@ concurrency: jobs: autotag: - if: github.event.pull_request.merged == true + #if: github.event.pull_request.merged == true runs-on: ubuntu-latest permissions: contents: write From 4246b47576adeb433e4ae02fcaa94eae33e40e1f Mon Sep 17 00:00:00 2001 From: Harald Klimach Date: Wed, 21 May 2025 00:05:53 +0200 Subject: [PATCH 4/6] remove additional v prefix again --- .github/workflows/tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 31e62df..8ce2c7c 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -17,7 +17,7 @@ jobs: permissions: contents: write outputs: - new-tag: v${{ steps.tagbump.outputs.new-tag }} + new-tag: ${{ steps.tagbump.outputs.new-tag }} otag: ${{ steps.tagbump.outputs.tag }} strategy: matrix: From 6230afd95b9037142f60261fd2e9a718460a0299 Mon Sep 17 00:00:00 2001 From: Harald Klimach Date: Wed, 21 May 2025 00:12:59 +0200 Subject: [PATCH 5/6] Ensure tag starts with v --- .github/workflows/tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 8ce2c7c..f088bae 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -17,7 +17,7 @@ jobs: permissions: contents: write outputs: - new-tag: ${{ steps.tagbump.outputs.new-tag }} + new-tag: ${{ startsWith(steps.tagbump.outputs.new-tag, 'v') && steps.tagbump.outputs.new-tag || format('v{0}', steps.tagbump.outputs.new-tag) }} otag: ${{ steps.tagbump.outputs.tag }} strategy: matrix: From aaa4ba2f3d2b3804cce5951b99e1c1bb2b10d70d Mon Sep 17 00:00:00 2001 From: Harald Klimach Date: Wed, 21 May 2025 00:17:31 +0200 Subject: [PATCH 6/6] Run tagging upon merge --- .github/workflows/tag.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index f088bae..945ca7a 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -3,8 +3,8 @@ name: Bump version on: workflow_dispatch: pull_request: - #types: - # - closed + types: + - closed branches: - main concurrency: @@ -12,7 +12,7 @@ concurrency: jobs: autotag: - #if: github.event.pull_request.merged == true + if: github.event.pull_request.merged == true runs-on: ubuntu-latest permissions: contents: write @@ -30,7 +30,6 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} branch: main - dry-run: true with-v: true movetags: