From 776b69a12a41009aa76aa0eb9e97f5708f57e8b7 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Mon, 10 Feb 2025 14:36:57 -0800
Subject: [PATCH] update: rebase before push

---
 .github/workflows/update.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index decf3d16b..2b4c253d9 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -33,6 +33,13 @@ jobs:
       run: ./ci/update-nur.sh
       env:
         API_TOKEN_GITHUB: '${{ steps.get_workflow_token.outputs.token }}'
+    - name: rebase # TODO: fix upstream push-protected to retry when push fails
+      run: |
+        ./ci/lib/setup-git.sh
+        git -C $GITHUB_WORKSPACE/nur fetch origin master
+        git -C $GITHUB_WORKSPACE/nur pull --rebase origin master
+      env:
+        GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
     - uses: CasperWA/push-protected@v2
       with:
         token: ${{ steps.get_workflow_token.outputs.token }}