From 369cee8e72d06dd8a463864ea9531ee620ca9e84 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 15 Aug 2024 02:45:37 -0500 Subject: [PATCH 1/6] Remove MIPS from CI Mips has been demoted to tier 3. CI is failing, so there is no reason to keep it. --- .github/workflows/main.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 63c5b83..0bb4698 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,14 +39,6 @@ jobs: test: true - target: arm-unknown-linux-gnueabihf test: true - - target: mips-unknown-linux-gnu - test: true - - target: mips64-unknown-linux-gnuabi64 - test: true - - target: mips64el-unknown-linux-gnuabi64 - test: true - - target: mipsel-unknown-linux-gnu - test: true - target: powerpc-unknown-linux-gnu test: true - target: s390x-unknown-linux-gnu From 06da116bf4ed98b0976e3b54abdf7a84dbf20780 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 15 Aug 2024 02:52:30 -0500 Subject: [PATCH 2/6] Update `libz-sys` version The current version has `check-cfg` errors. Update to avoid them. --- test-crate/Cargo.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test-crate/Cargo.toml b/test-crate/Cargo.toml index f3900ad..88caab7 100644 --- a/test-crate/Cargo.toml +++ b/test-crate/Cargo.toml @@ -2,11 +2,10 @@ name = "test-crate" version = "0.1.0" edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +publish = false [dependencies] -libz-sys = { version = "1.1.8", default-features = false, features = ["zlib-ng"] } +libz-sys = { version = "1.1.19", default-features = false, features = ["zlib-ng"] } [patch.crates-io] cmake = { path = ".." } From c044d21ec7ecb0f858a2eb4e16f79257ddce7c01 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 15 Aug 2024 03:01:36 -0500 Subject: [PATCH 3/6] Update solaris and Windows cross compile CI The `pc-solaris` target was made the default in and the `sun-solaris` target was removed in . Switch from `x86_64-sun-solaris` to `x86_64-pc-solaris` to reflect this. Additionally, disable tests for the Windows cross compile target since there is an error launching Wine. This may be . --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0bb4698..8801ef5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,15 +47,15 @@ jobs: test: true - target: aarch64-unknown-linux-musl test: true - - target: x86_64-pc-windows-gnu - test: true # Build only + - target: x86_64-pc-solaris + test: false + - target: x86_64-pc-windows-gnu + test: false - target: x86_64-unknown-freebsd test: false - target: x86_64-unknown-netbsd test: false - - target: x86_64-sun-solaris - test: false - target: x86_64-unknown-illumos test: false steps: From e31c0840f3130922e1e20dd57513cade17cb548f Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 15 Aug 2024 03:09:03 -0500 Subject: [PATCH 4/6] Bump CI toolchain versions --- .github/workflows/main.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8801ef5..f9845c7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,9 @@ jobs: steps: - uses: actions/checkout@master - name: Install Rust - run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }} + run: | + rustup update ${{ matrix.rust }} --no-self-update + rustup default ${{ matrix.rust }} - run: cargo test - name: Integration test run: cargo test --manifest-path test-crate/Cargo.toml @@ -23,7 +25,10 @@ jobs: steps: - uses: actions/checkout@master - name: Install Rust - run: rustup update stable && rustup default stable && rustup component add rustfmt + run: | + rustup update stable --no-self-update + rustup default stable + rustup component add rustfmt - run: cargo fmt -- --check cross_compile_test: @@ -60,11 +65,13 @@ jobs: test: false steps: - uses: actions/checkout@master - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.platform.target }} - - uses: taiki-e/install-action@v1 + - name: Install Rust + run: | + rustup update stable --no-self-update + rustup default stable + rustup target add ${{ matrix.platform.target }} + - run: cargo fmt -- --check + - uses: taiki-e/install-action@v2 with: tool: cross - name: cross test From 0ea0d071ecfd4f027456b74e95fff9527661db4f Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 15 Aug 2024 03:17:16 -0500 Subject: [PATCH 5/6] Update configuration for BSD `target_os` `dragonfly` was moved to `dragonflybsd`, and `bitrig` is no longer a target. Adjust `cfg!` statements to match this. --- src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 035cead..7649a6f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -837,8 +837,7 @@ impl Config { || cfg!(target_os = "openbsd") || cfg!(target_os = "netbsd") || cfg!(target_os = "freebsd") - || cfg!(target_os = "bitrig") - || cfg!(target_os = "dragonflybsd")) => + || cfg!(target_os = "dragonfly")) => { use_jobserver = true; cmd.env("MAKEFLAGS", makeflags); From ecdab82314c52ade66c23bab6f6a65a3eb58cd5a Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Thu, 15 Aug 2024 03:40:10 -0500 Subject: [PATCH 6/6] Disable the FreeBSD cross compilation test There is a GCC error building the latest crate. See for details. --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f9845c7..301c039 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,8 +57,9 @@ jobs: test: false - target: x86_64-pc-windows-gnu test: false - - target: x86_64-unknown-freebsd - test: false + # FIXME: build fails, see + # - target: x86_64-unknown-freebsd + # test: false - target: x86_64-unknown-netbsd test: false - target: x86_64-unknown-illumos