diff --git a/.forgejo/workflows/update_nix_flakes.yml b/.forgejo/workflows/update_nix_flakes.yml index 47820d1..c6c8c92 100644 --- a/.forgejo/workflows/update_nix_flakes.yml +++ b/.forgejo/workflows/update_nix_flakes.yml @@ -9,6 +9,8 @@ jobs: runs-on: native steps: + + - name: checkout repository uses: actions/checkout@v2 with: @@ -19,10 +21,11 @@ jobs: git config --local user.email "action@git.ingolf-wagner.de" git config --local user.name "Forgejo Action" - - name: rebase with main branch - run: | - git fetch origin main - git rebase origin/main + # fixme: not working for some reason + #- name: rebase with main branch + # run: | + # git fetch origin main + # git rebase origin/main - name: setup ssh run: | @@ -42,6 +45,8 @@ jobs: - name: update nix flakes run: nix flake update + # we need the ssh-agent here, otherwise git push would use the GITHUB_TOKEN + # which prevents other workflows to be triggered - name: commit and push changes run: | git diff --quiet && \