From b3117e9ad82815638646bc0c72e8af41937edecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n?= <sebastian@sebastian.software>
Date: Sat, 28 Feb 2026 11:54:55 +0100
Subject: [PATCH] fix(nix): Pull before push in workflows (#1049)

---
 .github/workflows/update-nix-assets-hash.yaml    | 4 +++-
 .github/workflows/update-nix-pnpm-deps-hash.yaml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-nix-assets-hash.yaml b/.github/workflows/update-nix-assets-hash.yaml
index bd0f42b31..321114161 100644
--- a/.github/workflows/update-nix-assets-hash.yaml
+++ b/.github/workflows/update-nix-assets-hash.yaml
@@ -37,8 +37,10 @@ jobs:
       - name: Update Hash
         run: nix/update-assets-hash.sh
 
+      - name: Pull with rebase
+        run: git pull --rebase --autostash
+
       - uses: stefanzweifel/git-auto-commit-action@v6
         with:
           commit_message: 'chore(nix): update assets hash'
           commit_author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
-          pull: '--rebase --autostash'
diff --git a/.github/workflows/update-nix-pnpm-deps-hash.yaml b/.github/workflows/update-nix-pnpm-deps-hash.yaml
index 7153aec22..e9fc83d80 100644
--- a/.github/workflows/update-nix-pnpm-deps-hash.yaml
+++ b/.github/workflows/update-nix-pnpm-deps-hash.yaml
@@ -36,8 +36,10 @@ jobs:
       - name: Update Hash
         run: nix/update-pnpm-deps-hash.sh
 
+      - name: Pull with rebase
+        run: git pull --rebase --autostash
+
       - uses: stefanzweifel/git-auto-commit-action@v6
         with:
           commit_message: 'chore(nix): update pnpmDeps hash'
           commit_author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
-          pull: '--rebase --autostash'