From dfd71c024530779aab3665286a162b30367dfb52 Mon Sep 17 00:00:00 2001 From: rami3l Date: Sun, 11 Feb 2024 10:05:50 +0800 Subject: [PATCH 1/2] ci: remove the now-tier3 `mips*-unknown-linux-gnu*` targets from the build --- .github/workflows/ci.yaml | 4 ---- ci/actions-templates/linux-builds-template.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d4f7c5117f..46e7cb69d1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -749,10 +749,6 @@ jobs: - x86_64-unknown-illumos # skip-pr skip-master - powerpc-unknown-linux-gnu # skip-pr skip-master - powerpc64le-unknown-linux-gnu # skip-pr skip-master - - mips-unknown-linux-gnu # skip-pr skip-master - - mips64-unknown-linux-gnuabi64 # skip-pr skip-master - - mipsel-unknown-linux-gnu # skip-pr skip-master - - mips64el-unknown-linux-gnuabi64 # skip-pr skip-master - s390x-unknown-linux-gnu # skip-pr skip-master - arm-linux-androideabi # skip-pr skip-master - armv7-linux-androideabi # skip-pr skip-master diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml index 8c6041378f..d2dfbf44de 100644 --- a/ci/actions-templates/linux-builds-template.yaml +++ b/ci/actions-templates/linux-builds-template.yaml @@ -31,10 +31,6 @@ jobs: # skip-master skip-pr skip-stable - x86_64-unknown-illumos # skip-pr skip-master - powerpc-unknown-linux-gnu # skip-pr skip-master - powerpc64le-unknown-linux-gnu # skip-pr skip-master - - mips-unknown-linux-gnu # skip-pr skip-master - - mips64-unknown-linux-gnuabi64 # skip-pr skip-master - - mipsel-unknown-linux-gnu # skip-pr skip-master - - mips64el-unknown-linux-gnuabi64 # skip-pr skip-master - s390x-unknown-linux-gnu # skip-pr skip-master - arm-linux-androideabi # skip-pr skip-master - armv7-linux-androideabi # skip-pr skip-master From df2d3f48f8f89bf0ac743e403e201bf5d5e8b06e Mon Sep 17 00:00:00 2001 From: rami3l Date: Wed, 14 Feb 2024 11:19:27 +0800 Subject: [PATCH 2/2] fix(deps): downgrade `openssl-sys` to 0.9.92 --- Cargo.lock | 12 ++++++------ ci/docker/x86_64-unknown-linux-gnu/Dockerfile | 5 ----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 54af88547a..4d94a4a835 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1305,9 +1305,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.63" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ "bitflags 2.4.2", "cfg-if 1.0.0", @@ -1337,18 +1337,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "111.28.1+1.1.1w" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "4bf7e82ffd6d3d6e6524216a0bfd85509f68b5b28354e8e7800057e44cefa9b4" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", diff --git a/ci/docker/x86_64-unknown-linux-gnu/Dockerfile b/ci/docker/x86_64-unknown-linux-gnu/Dockerfile index f49b646787..6b7d2e730a 100644 --- a/ci/docker/x86_64-unknown-linux-gnu/Dockerfile +++ b/ci/docker/x86_64-unknown-linux-gnu/Dockerfile @@ -1,6 +1 @@ FROM rust-x86_64-unknown-linux-gnu - -# Install `perl-IPC-Cmd` to make OpenSSL v3 happy. -# See: -RUN yum upgrade -y && \ - yum install -y perl-IPC-Cmd