From 3f84fc01c6adab66df69326e0eaca04a560bb892 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 20 Mar 2024 08:39:56 +0100 Subject: [PATCH 1/2] Add match-label-action --- .github/workflows/release-helm.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-helm.yaml b/.github/workflows/release-helm.yaml index 3e507d7..a4c0612 100644 --- a/.github/workflows/release-helm.yaml +++ b/.github/workflows/release-helm.yaml @@ -26,10 +26,15 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} + - id: bump + uses: zwaldowski/match-label-action@v1 + with: + allowed: major,minor,patch + - uses: zwaldowski/semver-release-action@v2 with: dry_run: true - bump: ${{ steps.pr.outputs.labels }} + bump: ${{ steps.bump.outputs.match }} github_token: ${{ secrets.GITHUB_TOKEN }} - name: Set version output @@ -94,4 +99,4 @@ jobs: prerelease: false title: ${{ needs.generate-version.outputs.version }} files: | - LICENSE \ No newline at end of file + LICENSE From 2fdb4f74eb43cbb5d54f6706b8d7ef7d4b8b5d58 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 20 Mar 2024 08:44:22 +0100 Subject: [PATCH 2/2] Rename step id --- .github/workflows/check.yaml | 6 +++--- .github/workflows/release-helm.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index dfa0106..b6cf2e7 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -23,7 +23,7 @@ jobs: java-version: '11' java-package: jdk - - id: bump + - id: match-label uses: zwaldowski/match-label-action@v1 with: allowed: major,minor,patch @@ -31,7 +31,7 @@ jobs: - uses: zwaldowski/semver-release-action@v2 with: dry_run: true - bump: ${{ steps.bump.outputs.match }} + bump: ${{ steps.match-label.outputs.match }} github_token: ${{ secrets.GITHUB_TOKEN }} comment: @@ -47,4 +47,4 @@ jobs: uses: thollander/actions-comment-pull-request@1.0.2 with: message: "Please apply one of the following labels to the PR: 'patch', 'minor', 'major'." - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-helm.yaml b/.github/workflows/release-helm.yaml index a4c0612..20fb92b 100644 --- a/.github/workflows/release-helm.yaml +++ b/.github/workflows/release-helm.yaml @@ -26,7 +26,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} - - id: bump + - id: match-label uses: zwaldowski/match-label-action@v1 with: allowed: major,minor,patch @@ -34,7 +34,7 @@ jobs: - uses: zwaldowski/semver-release-action@v2 with: dry_run: true - bump: ${{ steps.bump.outputs.match }} + bump: ${{ steps.match-label.outputs.match }} github_token: ${{ secrets.GITHUB_TOKEN }} - name: Set version output