From dfa4375152a2d19cb8703984e16b4950446790b3 Mon Sep 17 00:00:00 2001 From: Mick Grove Date: Thu, 12 Feb 2026 21:46:17 -0800 Subject: [PATCH] Fixed CI runner failure when executing tests --- .github/workflows/release.yml | 17 ++++------------- Makefile | 17 ++++++----------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c302f9..f374775 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,11 +51,8 @@ jobs: - name: Install packaging tools run: cargo install cargo-deb cargo-generate-rpm - - name: Build (Makefile ubuntu-x64) - run: make ubuntu-x64 - - - name: Run tests - run: make tests + - name: Build (Makefile linux-x64) + run: make linux-x64 env: CARGO_BUILD_JOBS: 1 @@ -123,11 +120,8 @@ jobs: - name: Install packaging tools run: cargo install cargo-deb cargo-generate-rpm - - name: Build (Makefile ubuntu-arm64) - run: make ubuntu-arm64 - - - name: Run tests - run: make tests + - name: Build (Makefile linux-arm64) + run: make linux-arm64 env: CARGO_BUILD_JOBS: 1 @@ -185,9 +179,6 @@ jobs: - name: Build Darwin x64 run: make darwin-x64 - - name: Run tests - run: make tests - - name: Move artifacts to dist shell: bash run: | diff --git a/Makefile b/Makefile index 3ff34bf..086e4c1 100644 --- a/Makefile +++ b/Makefile @@ -248,9 +248,7 @@ endif linux-x64: check-docker create-dockerignore @mkdir -p target/release docker run --platform linux/amd64 --rm \ - -e CARGO_HOME=/src/.cargo-home \ -v "$$(pwd):/src" -w /src rust:1.92-alpine sh -eu -c '\ - mkdir -p /src/.cargo-home && \ apk add --no-cache \ musl-dev \ gcc g++ make cmake pkgconfig \ @@ -258,10 +256,10 @@ linux-x64: check-docker create-dockerignore bzip2-dev bzip2-static \ xz-dev xz-static \ boost-dev linux-headers \ - patch perl ragel \ - git curl && \ + patch perl ragel && \ + git openssl-dev curl && \ \ - cargo test --workspace --all-targets ; \ + cargo test --workspace --all-targets -- --test-threads=1 ; \ \ rustup target add x86_64-unknown-linux-musl && \ \ @@ -279,9 +277,7 @@ linux-x64: check-docker create-dockerignore linux-arm64: check-docker create-dockerignore @mkdir -p target/release docker run --platform linux/arm64 --rm \ - -e CARGO_HOME=/src/.cargo-home \ -v "$$(pwd):/src" -w /src rust:1.92-alpine sh -eu -c '\ - mkdir -p /src/.cargo-home && \ apk add --no-cache \ musl-dev \ gcc g++ make cmake pkgconfig \ @@ -289,12 +285,12 @@ linux-arm64: check-docker create-dockerignore bzip2-dev bzip2-static \ xz-dev xz-static \ boost-dev linux-headers \ - patch perl ragel \ - git curl && \ + patch perl ragel && \ + git openssl-dev curl && \ \ rustup target add aarch64-unknown-linux-musl && \ \ - cargo test --workspace --all-targets ; \ + cargo test --workspace --all-targets -- --test-threads=1 ; \ \ export PKG_CONFIG_ALLOW_CROSS=1 ; \ export RUSTFLAGS="-C target-feature=+crt-static" ; \ @@ -309,7 +305,6 @@ linux-arm64: check-docker create-dockerignore $(MAKE) list-archives - # ============= AGGREGATE TARGETS ============= #