julian/hydra-jobs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workflow: rebase instead of reset to fix git push

Browse Source
This commit is contained in:
Julian Mutter 2025-03-22 07:30:22 +01:00
parent 301c6bd2c3
commit 9cb9466992
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitea/workflows/update-flake.yaml
View File

@ -19,7 +19,8 @@ jobs:
- name: Fetch latest changes and reset branch - name: Fetch latest changes and reset branch
run: | run: |
git fetch origin main git fetch origin main
git reset --hard origin/main git status
git rebase origin/main
- name: Set up Nix - name: Set up Nix
uses: cachix/install-nix-action@v31 uses: cachix/install-nix-action@v31