From 7eab6e496ad1516b273e47a7dab9b29cfaa25a4e Mon Sep 17 00:00:00 2001 From: Stephan Boyer Date: Mon, 1 Jul 2024 22:25:58 -0700 Subject: [PATCH] Remove some redundancy in the CI workflow --- .github/workflows/ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44c76ce2..6f31f2f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,18 +97,19 @@ jobs: rustup target add x86_64-pc-windows-msvc rustup target add aarch64-pc-windows-msvc - # Build and test for x86_64-pc-windows-msvc. + # Build for x86_64-pc-windows-msvc. RUSTFLAGS='--codegen target-feature=+crt-static' cargo build \ --locked \ --release \ --target x86_64-pc-windows-msvc - NO_COLOR=true cargo test --locked # [ref:colorless_tests] - # Build and test for aarch64-pc-windows-msvc. + # Build for aarch64-pc-windows-msvc. RUSTFLAGS='--codegen target-feature=+crt-static' cargo build \ --locked \ --release \ --target aarch64-pc-windows-msvc + + # Run the tests. NO_COLOR=true cargo test --locked # [ref:colorless_tests] - uses: actions/upload-artifact@v4 with: @@ -137,16 +138,17 @@ jobs: rustup target add x86_64-apple-darwin rustup target add aarch64-apple-darwin - # Build and test for x86_64-apple-darwin. + # Build for x86_64-apple-darwin. SDKROOT=$(xcrun --show-sdk-path) \ MACOSX_DEPLOYMENT_TARGET=$(xcrun --show-sdk-version) \ cargo build --locked --release --target x86_64-apple-darwin - NO_COLOR=true cargo test --locked # [ref:colorless_tests] - # Build and test for aarch64-apple-darwin. + # Build for aarch64-apple-darwin. SDKROOT=$(xcrun --show-sdk-path) \ MACOSX_DEPLOYMENT_TARGET=$(xcrun --show-sdk-version) \ cargo build --locked --release --target aarch64-apple-darwin + + # Run the tests. NO_COLOR=true cargo test --locked # [ref:colorless_tests] - uses: actions/upload-artifact@v4 with: