From 1968beeabd763cec23ab7164342a4193214791c7 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 19 Dec 2023 23:12:41 +0100 Subject: [PATCH] check-by-name: Pass --base in CI and local running script This enables the ratchet checks for pkgs/by-name, allowing gradual migrations! --- .github/workflows/check-by-name.yml | 2 +- pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index c006ffc78f56b..a761f6cae09bb 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -87,7 +87,7 @@ jobs: run: pkgs/test/nixpkgs-check-by-name/scripts/fetch-tool.sh "$GITHUB_BASE_REF" result - name: Running nixpkgs-check-by-name run: | - if result/bin/nixpkgs-check-by-name .; then + if result/bin/nixpkgs-check-by-name --base "$base" .; then exit 0 else exitCode=$? diff --git a/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh b/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh index a1debe73f8ad8..060f83469f4df 100755 --- a/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh +++ b/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh @@ -63,4 +63,4 @@ echo >&2 -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m" cleanup_commands+=('rm "$tmp/tool"') echo >&2 "Running nixpkgs-check-by-name.." -"$tmp/tool/bin/nixpkgs-check-by-name" "$tmp/merged" +"$tmp/tool/bin/nixpkgs-check-by-name" --base "$tmp/base" "$tmp/merged"