From f6746fb689a6a8fc59f91fb188f76463b65efd07 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Thu, 12 Jan 2023 15:34:26 -0800
Subject: [PATCH] ci: retry pushing benchmark data

---
 .github/workflows/benchmark.yml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 37e843618..c8dd015ed 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -123,14 +123,19 @@ jobs:
     - name: Push benchmark repo
       working-directory: benchmark-results
       run: |
-        npm ci
-        node ./bin/collect.js ../benchmark-startup.log data/startup.json
-        node ./bin/collect.js ../benchmark-send.log data/send.json
-        node ./bin/collect.js ../benchmark-group-send.log data/group-send.json
-        node ./bin/collect.js ../benchmark-convo-open.log data/convo-open.json
-        npm run build
-        git config --global user.email "no-reply@signal.org"
-        git config --global user.name "Signal Bot"
-        git add .
-        git commit --message "${GITHUB_REF} ${GITHUB_SHA}"
-        git push --force origin main
+        for attempt in {1..5}; do
+          echo "Attempting to push to repository #$attempt"
+          git fetch origin
+          git reset --hard origin/main
+          npm ci
+          node ./bin/collect.js ../benchmark-startup.log data/startup.json
+          node ./bin/collect.js ../benchmark-send.log data/send.json
+          node ./bin/collect.js ../benchmark-group-send.log data/group-send.json
+          node ./bin/collect.js ../benchmark-convo-open.log data/convo-open.json
+          npm run build
+          git config --global user.email "no-reply@signal.org"
+          git config --global user.name "Signal Bot"
+          git add .
+          git commit --message "${GITHUB_REF} ${GITHUB_SHA}"
+          git push origin main && break || sleep `$((1 + RANDOM % 5))`
+        done