From 30b5f3b76b6788e3065c749c87f321bfe516553a Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Thu, 14 Mar 2024 16:09:21 +1000 Subject: [PATCH] Fixes --- .github/actions/nss/action.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/nss/action.yml b/.github/actions/nss/action.yml index 347c53cb8e..68e222710c 100644 --- a/.github/actions/nss/action.yml +++ b/.github/actions/nss/action.yml @@ -20,18 +20,19 @@ runs: shell: bash run: | if ! command -v pkg-config &> /dev/null; then - echo "BUILD_NSS=1" >> "$GITHUB_ENV + echo "BUILD_NSS=1" >> "$GITHUB_ENV" exit 0 fi NSS_VERSION=$(pkg-config --modversion nss) NSS_MAJOR=$(echo $NSS_VERSION | cut -d. -f1) NSS_MINOR=$(echo $NSS_VERSION | cut -d. -f2) + # Keep this in sync with what the code requires if [ $NSS_MAJOR -ne 3 ] || [ $NSS_MINOR -lt 98 ]; then echo "System NSS is too old: $NSS_VERSION" - echo "BUILD_NSS=1" >> "$GITHUB_ENV + echo "BUILD_NSS=1" >> "$GITHUB_ENV" else echo "System NSS is suitable: $NSS_VERSION" - echo "BUILD_NSS=0" >> "$GITHUB_ENV + echo "BUILD_NSS=0" >> "$GITHUB_ENV" fi # Ideally, we'd use this. But things are sufficiently flaky that we're better off