fix(actions/flux-localhost-build): git pull strategy

JJGadgets · May 19, 2024 · 3910c7c · 3910c7c
1 parent f4aa686
commit 3910c7c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/flux-localhost-build.yaml b/.github/workflows/flux-localhost-build.yaml
@@ -64,7 +64,7 @@ jobs:
           git config user.email "${{ secrets.BOT_USERNAME }} <${{ secrets.BOT_API_ID }}+${{ secrets.BOT_USERNAME }}[bot]@users.noreply.github.com>" # get $BOT_API_ID from `curl -s 'https://api.github.com/users/$(BOT_USERNAME)%5Bbot%5D' | yq .id`
 
           git checkout ${{ env.BRANCH }} || git checkout -b ${{ env.BRANCH }} main
-          git pull origin ${{ env.BRANCH }} || true
+          git pull --rebase --autostash origin ${{ env.BRANCH }} || true
 
           mkdir -p /tmp/flux
           flux pull artifact oci://ghcr.io/fluxcd/flux-manifests:v${{ env.FLUX_VERSION }} --output /tmp/flux/