Skip to content

Commit

Permalink
Fix Nixpkgs diff
Browse files Browse the repository at this point in the history
a78b63e made it do a merge commit, but
that requires an identity to be set: https://github.com/NixOS/nixfmt/actions/runs/10610964217/job/29409472985?pr=243
  • Loading branch information
infinisil committed Aug 29, 2024
1 parent 738abf3 commit ceceb4f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions scripts/sync-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ isLinear() {

step "Fetching nixfmt pull request and creating a branch for the head commit"
git init nixfmt -b unused
git -C nixfmt config user.name "GitHub Actions"
git -C nixfmt config user.email "actions@noreply.github.com"
git -C nixfmt fetch "$nixfmtUrl" "refs/pull/$nixfmtPrNumber/merge"
nixfmtBaseCommit=$(git -C nixfmt rev-parse FETCH_HEAD^1)
nixfmtHeadCommit=$(git -C nixfmt rev-parse FETCH_HEAD^2)
Expand Down

0 comments on commit ceceb4f

Please sign in to comment.