Skip to content

tools: fix Nix diff tools when pushing more than 1 commit #66383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aduh95 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

tools: fix Nix diff tools when pushing more than 1 commit #66383

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/nix-changes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,16 @@ jobs:

- name: Compute requisites before change
run: |
git reset HEAD^ --hard
# TODO(aduh95): remove this once list-requisites.sh has reached `main`
[ -f tools/nix/list-requisites.sh ] || git checkout FETCH_HEAD -- tools/nix/list-requisites.sh
BASE_SHA="$(git rev-parse HEAD^)"
if [ -n "$PUSH_BEFORE_SHA" ] && [ "$PUSH_BEFORE_SHA" != "$BASE_SHA" ] \
&& [ "$PUSH_BEFORE_SHA" != "0000000000000000000000000000000000000000" ] \
&& git fetch --no-tags --depth=1 origin "$PUSH_BEFORE_SHA"; then
BASE_SHA="$PUSH_BEFORE_SHA"
fi
git reset "$BASE_SHA" --hard
./tools/nix/list-requisites.sh > requisites-${{ matrix.system }}-before.list
env:
PUSH_BEFORE_SHA: ${{ github.event_name == 'push' && github.event.before || '' }}

- name: Output diff
run: |
Expand Down
Loading