fix(nix): Pull before push in workflows (#1049)

2026-02-28 18:54:55 +08:00
parent 044d8dfbb5
commit b3117e9ad8
2 changed files with 6 additions and 2 deletions
@@ -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'
@@ -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'