From 1893f5439e495a4cd301aedd2acf45903cdb6ea7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 13 May 2025 08:24:25 +0200 Subject: [PATCH 1/3] workflows/check-format: run on all files This was run on .nix files only, but we recently added keep-sorted, editorconfig-checker and actionlint to treefmt, so CI needs to check all files instead. --- ci/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 { From afc3b33403dc2ba5a5ba51f214e14b2cede30bb6 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 13 May 2025 08:28:22 +0200 Subject: [PATCH 2/3] workflows/get-merge-commit: fix actionlint warning --- .github/workflows/get-merge-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 68bcd5e6f26da5cb4f75e5adb8a67441cb88fa88 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 13 May 2025 08:30:18 +0200 Subject: [PATCH 3/3] workflows/eval: fix missing dependency of tag job Introduced in #406266. --- .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 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