diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index c887638ab9b8..55f58bf9cbac 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -166,7 +166,7 @@ jobs: tag: name: Tag runs-on: ubuntu-24.04-arm - needs: [ process ] + needs: [ get-merge-commit, process ] if: needs.process.outputs.targetRunId permissions: pull-requests: write diff --git a/.github/workflows/get-merge-commit.yml b/.github/workflows/get-merge-commit.yml index 7d8dd03fbf66..d39e2ad3acfc 100644 --- a/.github/workflows/get-merge-commit.yml +++ b/.github/workflows/get-merge-commit.yml @@ -40,7 +40,7 @@ jobs: ;; pull_request_target) if commits=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then - echo "Checking the commits:\n$commits" + echo -e "Checking the commits:\n$commits" echo "$commits" >> "$GITHUB_OUTPUT" else # Skipping so that no notifications are sent diff --git a/ci/default.nix b/ci/default.nix index 619580035392..dd39e082a6fb 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -63,10 +63,7 @@ let fs = pkgs.lib.fileset; nixFilesSrc = fs.toSource { root = ../.; - fileset = fs.difference (fs.unions [ - (fs.fileFilter (file: file.hasExt "nix") ../.) - ../.git-blame-ignore-revs - ]) (fs.maybeMissing ../.git); + fileset = fs.difference ../. (fs.maybeMissing ../.git); }; in {