From 72fd375d1c6685cf1e6cbaf1142f86fafc33103c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 5 Jan 2025 14:13:33 +0100 Subject: [PATCH] workflows/eval: fix actionlint mergedSha is available from needs.get-merge-commit, not needs.attrs. Actionlint rightfully complains about that. The code still works as expected because nixpkgs/ is checked out at mergedSha, so the diff will be between mergedSha and baseSha. --- .github/workflows/eval.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 64969dc2b426..152a1b5d3468 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -203,7 +203,7 @@ jobs: if: steps.baseRunId.outputs.baseRunId run: | git -C nixpkgs worktree add ../base ${{ needs.attrs.outputs.baseSha }} - git -C nixpkgs diff --name-only ${{ needs.attrs.outputs.baseSha }} ${{ needs.attrs.outputs.mergedSha }} \ + git -C nixpkgs diff --name-only ${{ needs.attrs.outputs.baseSha }} \ | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json # Use the base branch to get accurate maintainer info