From 17f0a17cbb1c1c6908c810d657671d9b57561297 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Sat, 14 Mar 2026 10:27:25 +0100 Subject: [PATCH 1/2] fix(ci): Use version for release tag instead of branch name When the release workflow is triggered via workflow_dispatch, the release and tag were named after the branch (e.g., "master") instead of the actual version. Now the version is extracted from build.gradle.kts and used for both the tag and the GitHub release. Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/gradle-release.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml index 6565d5bb..0932dee9 100644 --- a/.github/workflows/gradle-release.yml +++ b/.github/workflows/gradle-release.yml @@ -13,6 +13,15 @@ jobs: contents: write steps: - uses: actions/checkout@v6 + - name: Determine release version + id: version + run: | + if [[ "${{ github.ref_type }}" == "tag" ]]; then + echo "tag=${{ github.ref_name }}" >> "$GITHUB_OUTPUT" + else + version=$(grep '^version' fladle-plugin/build.gradle.kts | sed 's/version = "//;s/"//') + echo "tag=v${version}" >> "$GITHUB_OUTPUT" + fi - uses: actions/setup-java@v5 with: java-version: "17" @@ -34,7 +43,14 @@ jobs: ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.GPG_SIGNING_KEY_ID }} ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SIGNING_KEY_PASSWORD }} run: ./gradlew :fladle-plugin:publishPlugins + - name: Create tag if needed + run: | + tag="${{ steps.version.outputs.tag }}" + if ! git rev-parse "$tag" >/dev/null 2>&1; then + git tag "$tag" + git push origin "$tag" + fi - name: Create GitHub Release env: GH_TOKEN: ${{ github.token }} - run: gh release create "${{ github.ref_name }}" --generate-notes + run: gh release create "${{ steps.version.outputs.tag }}" --generate-notes From 84f19b5bce2f836de68cb2f58670335005bf468e Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Sat, 14 Mar 2026 10:31:21 +0100 Subject: [PATCH 2/2] fix(ci): Remove manual workflow_dispatch trigger from release The workflow_dispatch trigger caused releases to be named after the branch (e.g., "master") instead of the version. Since releases should only be triggered by pushing a version tag, remove the manual trigger entirely. Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/gradle-release.yml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml index 0932dee9..a5b8bfa2 100644 --- a/.github/workflows/gradle-release.yml +++ b/.github/workflows/gradle-release.yml @@ -3,7 +3,6 @@ on: push: tags: - 'v*' - workflow_dispatch: jobs: release: @@ -13,15 +12,6 @@ jobs: contents: write steps: - uses: actions/checkout@v6 - - name: Determine release version - id: version - run: | - if [[ "${{ github.ref_type }}" == "tag" ]]; then - echo "tag=${{ github.ref_name }}" >> "$GITHUB_OUTPUT" - else - version=$(grep '^version' fladle-plugin/build.gradle.kts | sed 's/version = "//;s/"//') - echo "tag=v${version}" >> "$GITHUB_OUTPUT" - fi - uses: actions/setup-java@v5 with: java-version: "17" @@ -43,14 +33,7 @@ jobs: ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.GPG_SIGNING_KEY_ID }} ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SIGNING_KEY_PASSWORD }} run: ./gradlew :fladle-plugin:publishPlugins - - name: Create tag if needed - run: | - tag="${{ steps.version.outputs.tag }}" - if ! git rev-parse "$tag" >/dev/null 2>&1; then - git tag "$tag" - git push origin "$tag" - fi - name: Create GitHub Release env: GH_TOKEN: ${{ github.token }} - run: gh release create "${{ steps.version.outputs.tag }}" --generate-notes + run: gh release create "${{ github.ref_name }}" --generate-notes