From a8e0e41084c478cc53f94f4cc2338852c378ae5a Mon Sep 17 00:00:00 2001 From: "Celina G. Val" Date: Fri, 3 Jan 2025 13:50:28 -0800 Subject: [PATCH] Cat file and pipe it to jq to avoid macos failure --- .github/workflows/kani.yml | 8 -------- scripts/check_rustc.sh | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/kani.yml b/.github/workflows/kani.yml index 90463ec8574c6..c8ae40b98258d 100644 --- a/.github/workflows/kani.yml +++ b/.github/workflows/kani.yml @@ -2,14 +2,6 @@ name: Kani on: workflow_dispatch: - merge_group: - pull_request: - branches: [ main ] - push: - paths: - - 'library/**' - - '.github/workflows/kani.yml' - - 'scripts/run-kani.sh' defaults: run: diff --git a/scripts/check_rustc.sh b/scripts/check_rustc.sh index 1d7e0fc4152e4..810b19e497c18 100755 --- a/scripts/check_rustc.sh +++ b/scripts/check_rustc.sh @@ -51,7 +51,8 @@ echo "$COMMIT_ID for rustc is" # Get the full commit ID for shallow clone curl -H "Connection: close" -o "${TMP_RUST_DIR}/output.json" -s --show-error \ "https://api.github.com/repos/rust-lang/rust/commits?sha=${COMMIT_ID}&per_page=1" -COMMIT_ID=$(jq -r '.[0].sha' "${TMP_RUST_DIR}/output.json") + +COMMIT_ID=$(cat "${TMP_RUST_DIR}/output.json" | jq -r '.[0].sha') # Clone the rust-lang/rust repository echo "Cloning rust-lang/rust repository into ${TMP_RUST_DIR}..."