From 8ff49c429a2941db4b4a753b1c6d8f31ae233306 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Mon, 18 Nov 2024 06:17:18 -0500 Subject: [PATCH 1/2] Check for unrecognized `*-sys` dependencies This adds another step to `pure-rust-build` that fails -- and fails the job -- when there are any dependencies named `*-sys` other than `linux-raw-sys`, which is known about. (This is independent of the use of C in `ring` -- discussed in #1681, #1682, and #1684 -- because `ring` is not, and does not use, a `*-sys` dependency.) This should fail prior to 3506afb (#1684) and pass afterwards. --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32d6177c148..23b4ebe8337 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,6 +64,9 @@ jobs: pattern='.*\b(-sys|cc|cmake|pkg-config|vcpkg)\b.*' ! GREP_COLORS='ms=30;48;5;214' grep --color=always -Ex -C 1000000 -e "$pattern" tree.txt continue-on-error: true + - name: Check for unrecognized *-sys dependencies + run: | + ! grep -qP '(?/usr/local/bin/wrapper1 <<'EOF' From a1414c840bff11aca931a0ee6f73a416f62000e4 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Mon, 18 Nov 2024 06:45:10 -0500 Subject: [PATCH 2/2] Better name for `dpkg-query --status` argument This uses the variable name `package` rather than `pattern` for the variable that expands to an argument to `dpkg-query --status`, since this argument is always treated as a literal package name. (I had originally named it `pattern` because I had initially been thinking of using a different search command.) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23b4ebe8337..933d9b291e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,8 +43,8 @@ jobs: - name: Verify that we are in an environment with limited dev tools run: | set -x - for pattern in cmake g++ libssl-dev make pkgconf pkg-config; do - if dpkg-query --status -- "$pattern"; then + for package in cmake g++ libssl-dev make pkgconf pkg-config; do + if dpkg-query --status -- "$package"; then exit 1 fi done