From 2f459b28366fab03e2818cc96bec04606f13ccda Mon Sep 17 00:00:00 2001 From: Elias Lundell <36220731+LogFlames@users.noreply.github.com> Date: Wed, 27 Nov 2024 21:52:37 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20use=20maven=203.9.6=20a?= =?UTF-8?q?nd=20wait=20for=20checks=20before=20ff=20merge=20in=20release?= =?UTF-8?q?=20(#992)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/jreleaser.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml index 6739332c..d99f4433 100644 --- a/.github/workflows/jreleaser.yml +++ b/.github/workflows/jreleaser.yml @@ -34,6 +34,10 @@ jobs: java-version: '17' distribution: 'temurin' cache: maven + - name: Set up Maven + uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5 + with: + maven-version: 3.9.6 - name: Set git user run: | git config --global user.name "GitHub Actions Bot" @@ -120,6 +124,13 @@ jobs: run: | git commit -am "🔖 Setting SNAPSHOT version ${{ env.NEXT_RELEASE_VERSION }}" git push --set-upstream origin ${{ env.BRANCH_NAME }} + - name: Wait for Checks to pass before merge into protected branch main + uses: lewagon/wait-on-check-action@ccfb013c15c8afb7bf2b7c028fb74dc5a068cccc # v1.3.4 + with: + ref: ${{ env.BRANCH_NAME }} + running-workflow-name: Release + repo-token: ${{ secrets.GITHUB_TOKEN }} + wait-interval: 10 - name: Merge Fast Forward run: | git checkout main