From 8a40c641f61162287b96af6dac13ff197018ba8b Mon Sep 17 00:00:00 2001
From: Marcus Aspin <maspin@unilink.com>
Date: Tue, 15 Oct 2024 18:29:58 +0100
Subject: [PATCH] PI-2591 Retry push to GitHub Packages (#4315)

Also add version to Sentry release
---
 .github/workflows/build.yml  | 6 +++++-
 .github/workflows/deploy.yml | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7072f5cf6..7483d2e27 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -107,7 +107,11 @@ jobs:
 
       - name: Push images
         if: env.push == 'true'
-        run: ./gradlew ${{ matrix.project }}:jib
+        uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
+        with:
+          max_attempts: 3 # Pushing lots of new image versions at once can result in GitHub rate-limiting so we retry this step
+          timeout_minutes: 15
+          command: ./gradlew ${{ matrix.project }}:jib
         env:
           GITHUB_USERNAME: ${{ github.actor }}
           GITHUB_PASSWORD: ${{ github.token }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 91c01bc83..4a04a4874 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -158,3 +158,4 @@ jobs:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
         with:
           environment: ${{ inputs.environment }}
+          version: ${{ inputs.version }}