From 5e7b966e1ab464b237a859ef7d728387cdd44cd1 Mon Sep 17 00:00:00 2001
From: Elias Lundell <36220731+LogFlames@users.noreply.github.com>
Date: Thu, 28 Nov 2024 15:55:30 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20ci:=20update=20jreleaser=20versi?=
 =?UTF-8?q?on=20to=201.15.0=20(push=20sbom=20to=20maven-central)=20(#996)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/jreleaser.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml
index cbcd4730..bafa0547 100644
--- a/.github/workflows/jreleaser.yml
+++ b/.github/workflows/jreleaser.yml
@@ -67,7 +67,6 @@ jobs:
         with:
             github-token: ${{ secrets.GITHUB_TOKEN }}
             include-maven-plugins: true
-            commit-lockfile: false
       - name: set branchname to next version
         run: echo "BRANCH_NAME=release/$NEXT_VERSION" >> $GITHUB_ENV
       - name: Set release version
@@ -90,7 +89,7 @@ jobs:
         uses: jreleaser/release-action@f69e545b05f149483cecb2fb81866247992694b8
         with:
           setup-java: false
-          version: 1.4.0
+          version: 1.15.0
           arguments: full-release 
         env:
           JRELEASER_PROJECT_VERSION: ${{ env.NEXT_VERSION }}
@@ -125,18 +124,27 @@ 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: 'Build and release'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          wait-interval: 10
       - name: Merge Fast Forward
         run: |
           git checkout main
           git merge --ff-only ${{ env.BRANCH_NAME }}
-          git push origin main
+      - name: Attempt Push with Retry
+        env:
+          RETRY_MAX_TIME: 600
+          RETRY_INTERVAL: 10
+        run: |
+          START_TIME=$(date +%s)
+          while true; do
+            git push origin main && break
+            ELAPSED_TIME=$(( $(date +%s) - START_TIME ))
+            if [ "$ELAPSED_TIME" -ge $RETRY_MAX_TIME ]; then
+              echo "Push failed after $RETRY_MAX_TIME seconds. Exiting..."
+              exit 1
+            fi
+
+            echo "Push failed. Retrying in $RETRY_INTERVAL seconds..."
+            sleep $RETRY_INTERVAL
+          done
 # Log failure:
       - name: JReleaser release output
         if: always()