From a0b979d3f89c97f92c0a5f505c799fa5a683fed7 Mon Sep 17 00:00:00 2001 From: Mick Grove Date: Thu, 5 Mar 2026 22:50:11 -0800 Subject: [PATCH] v1.86.0 --- .github/workflows/ci.yml | 26 +++++++++++++------------- .github/workflows/release.yml | 26 +++++++++++++------------- Makefile | 8 ++++++++ 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4c06e9..8ac7889 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,12 +40,12 @@ jobs: shared-key: kingfisher-${{ runner.os }}-${{ runner.arch }} cache-on-failure: true - - name: Build (Makefile linux-x64) - run: make ubuntu-x64 - name: Run tests run: make tests env: CARGO_BUILD_JOBS: 1 + - name: Build (Makefile linux-x64) + run: make ubuntu-x64 linux-arm64: name: Linux arm64 @@ -74,12 +74,12 @@ jobs: shared-key: kingfisher-${{ runner.os }}-${{ runner.arch }} cache-on-failure: true - - name: Build (Makefile linux-arm64) - run: make ubuntu-arm64 - name: Run tests run: make tests env: CARGO_BUILD_JOBS: 1 + - name: Build (Makefile linux-arm64) + run: make ubuntu-arm64 macos-arm64: name: macOS arm64 @@ -95,10 +95,10 @@ jobs: with: shared-key: kingfisher-${{ runner.os }}-${{ runner.arch }} cache-on-failure: true - - name: Build (Makefile darwin-arm64) - run: make darwin-arm64 - name: Run tests run: make tests + - name: Build (Makefile darwin-arm64) + run: make darwin-arm64 windows: name: Windows ${{ matrix.arch }} @@ -136,9 +136,9 @@ jobs: shared-key: kingfisher-${{ runner.os }}-${{ runner.arch }} cache-on-failure: true - - name: Build + - name: Prepare Windows dependencies shell: msys2 {0} - run: make windows-${{ matrix.arch }} + run: WINDOWS_ONLY_DEPS=1 make windows-${{ matrix.arch }} - name: Run tests shell: msys2 {0} @@ -164,12 +164,12 @@ jobs: fi fi - if ! command -v cargo-nextest >/dev/null 2>&1; then - cargo install --locked cargo-nextest - fi + echo "▶ cargo test --release --workspace --all-targets --target $target_triple" + cargo test --release --workspace --all-targets --target "$target_triple" - echo "▶ cargo nextest run --release --workspace --all-targets --target $target_triple" - cargo nextest run --release --workspace --all-targets --target "$target_triple" + - name: Build + shell: msys2 {0} + run: make windows-${{ matrix.arch }} - name: Move artifact to dist shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7bbabf0..c0fe1c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,12 +49,12 @@ jobs: - name: Install packaging tools run: cargo install cargo-deb cargo-generate-rpm - - name: Build (Makefile linux-arm64) - run: make ubuntu-x64 - name: Run tests run: make tests env: CARGO_BUILD_JOBS: 1 + - name: Build (Makefile linux-x64) + run: make ubuntu-x64 - name: Fix permissions run: sudo chown -R $(id -u):$(id -g) target @@ -118,12 +118,12 @@ jobs: - name: Install packaging tools run: cargo install cargo-deb cargo-generate-rpm - - name: Build (Makefile linux-arm64) - run: make ubuntu-arm64 - name: Run tests run: make tests env: CARGO_BUILD_JOBS: 1 + - name: Build (Makefile linux-arm64) + run: make ubuntu-arm64 - name: Fix permissions run: sudo chown -R $(id -u):$(id -g) target @@ -203,10 +203,10 @@ jobs: shared-key: kingfisher-${{ runner.os }}-${{ runner.arch }} cache-on-failure: true - - name: Build Darwin arm64 - run: make darwin-arm64 - name: Run tests run: make tests + - name: Build Darwin arm64 + run: make darwin-arm64 - name: Move artifacts to dist shell: bash @@ -254,9 +254,9 @@ jobs: shared-key: kingfisher-${{ runner.os }}-${{ runner.arch }} cache-on-failure: true - - name: Build + - name: Prepare Windows dependencies shell: msys2 {0} - run: make windows-${{ matrix.arch }} + run: WINDOWS_ONLY_DEPS=1 make windows-${{ matrix.arch }} - name: Run tests shell: msys2 {0} @@ -282,12 +282,12 @@ jobs: fi fi - if ! command -v cargo-nextest >/dev/null 2>&1; then - cargo install --locked cargo-nextest - fi + echo "▶ cargo test --release --workspace --all-targets --target $target_triple" + cargo test --release --workspace --all-targets --target "$target_triple" - echo "▶ cargo nextest run --release --workspace --all-targets --target $target_triple" - cargo nextest run --release --workspace --all-targets --target "$target_triple" + - name: Build + shell: msys2 {0} + run: make windows-${{ matrix.arch }} - name: Move artifact to dist shell: bash diff --git a/Makefile b/Makefile index 7783c92..a82c94e 100644 --- a/Makefile +++ b/Makefile @@ -382,6 +382,10 @@ endif echo "Using HYPERSCAN_ROOT=$$HYPERSCAN_ROOT"; \ "$$RUSTUP_BIN" target add x86_64-pc-windows-gnu; \ export LIBHS_NO_PKG_CONFIG=1; \ + if [ "$${WINDOWS_ONLY_DEPS:-0}" = "1" ]; then \ + echo "WINDOWS_ONLY_DEPS=1 set; skipping cargo build and packaging."; \ + exit 0; \ + fi; \ "$$CARGO_BIN" build --release --target x86_64-pc-windows-gnu --features system-alloc; \ mkdir -p target/release; \ cp target/x86_64-pc-windows-gnu/release/$(PROJECT_NAME).exe target/release/$(PROJECT_NAME).exe; \ @@ -501,6 +505,10 @@ endif echo "Using HYPERSCAN_ROOT=$$HYPERSCAN_ROOT"; \ "$$RUSTUP_BIN" target add aarch64-pc-windows-gnullvm; \ export LIBHS_NO_PKG_CONFIG=1; \ + if [ "$${WINDOWS_ONLY_DEPS:-0}" = "1" ]; then \ + echo "WINDOWS_ONLY_DEPS=1 set; skipping cargo build and packaging."; \ + exit 0; \ + fi; \ "$$CARGO_BIN" build --release --target aarch64-pc-windows-gnullvm --features system-alloc; \ mkdir -p target/release; \ cp target/aarch64-pc-windows-gnullvm/release/$(PROJECT_NAME).exe target/release/$(PROJECT_NAME).exe; \