Skip to content

chore(deps): unpin openssl version #3793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 6, 2024
Merged

chore(deps): unpin openssl version #3793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f749e7
ci(linux-gnu): install `perl-IPC-Cmd` to make OpenSSL v3 happy
rami3l Apr 26, 2024
7b0c97b
fix(deps): update rust crate openssl-src to v300
renovate[bot] Apr 26, 2024
ed65b3d
ci(android): update NDK version
rami3l Apr 26, 2024
50db01b
ci: don't build for `i686-linux-android` due to OpenSSL v3 atomic issues
rami3l Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,6 @@ jobs:
- s390x-unknown-linux-gnu # skip-pr skip-master
- arm-linux-androideabi # skip-pr skip-master
- armv7-linux-androideabi # skip-pr skip-master
- i686-linux-android # skip-pr skip-master
- x86_64-linux-android # skip-pr skip-master
- riscv64gc-unknown-linux-gnu # skip-pr skip-master
- loongarch64-unknown-linux-gnu # skip-pr skip-master
Expand Down
14 changes: 6 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,7 @@ once_cell.workspace = true
opener = "0.7.0"
# `openssl` is used by `curl` or `reqwest` backend although it isn't imported by rustup: this
# allows controlling the vendoring status without exposing the presence of the download crate.
# HACK: We temporarily pin the OpenSSL version due to build issues encountered in
# https://github.com/rust-lang/rustup/pull/3668.
openssl = { version = "=0.10.57", optional = true }
openssl-src = { version = "=111.28.1", optional = true }
openssl-sys = { version = "=0.9.92", optional = true }
openssl = { version = "0.10", optional = true }
opentelemetry = { workspace = true, optional = true }
opentelemetry_sdk = { workspace = true, optional = true }
opentelemetry-otlp = { workspace = true, optional = true }
Expand Down
1 change: 0 additions & 1 deletion ci/actions-templates/linux-builds-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs: # skip-master skip-pr skip-stable
- s390x-unknown-linux-gnu # skip-pr skip-master
- arm-linux-androideabi # skip-pr skip-master
- armv7-linux-androideabi # skip-pr skip-master
- i686-linux-android # skip-pr skip-master
- x86_64-linux-android # skip-pr skip-master
- riscv64gc-unknown-linux-gnu # skip-pr skip-master
- loongarch64-unknown-linux-gnu # skip-pr skip-master
Expand Down
30 changes: 15 additions & 15 deletions ci/docker/android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin \
RANLIB_aarch64_linux_android=llvm-ranlib \
RANLIB_i686_linux_android=llvm-ranlib \
RANLIB_x86_64_linux_android=llvm-ranlib \
CC_arm_linux_androideabi=armv7a-linux-androideabi21-clang \
CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang \
CC_aarch64_linux_android=aarch64-linux-android21-clang \
CC_i686_linux_android=i686-linux-android21-clang \
CC_x86_64_linux_android=x86_64-linux-android21-clang \
CXX_arm_linux_androideabi=armv7a-linux-androideabi21-clang++ \
CXX_armv7_linux_androideabi=armv7a-linux-androideabi21-clang++ \
CXX_aarch64_linux_android=aarch64-linux-android21-clang++ \
CXX_i686_linux_android=i686-linux-android21-clang++ \
CXX_x86_64_linux_android=x86_64-linux-android21-clang++ \
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang \
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang \
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang \
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android21-clang \
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang
CC_arm_linux_androideabi=armv7a-linux-androideabi23-clang \
CC_armv7_linux_androideabi=armv7a-linux-androideabi23-clang \
CC_aarch64_linux_android=aarch64-linux-android23-clang \
CC_i686_linux_android=i686-linux-android23-clang \
CC_x86_64_linux_android=x86_64-linux-android23-clang \
CXX_arm_linux_androideabi=armv7a-linux-androideabi23-clang++ \
CXX_armv7_linux_androideabi=armv7a-linux-androideabi23-clang++ \
CXX_aarch64_linux_android=aarch64-linux-android23-clang++ \
CXX_i686_linux_android=i686-linux-android23-clang++ \
CXX_x86_64_linux_android=x86_64-linux-android23-clang++ \
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi23-clang \
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi23-clang \
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android23-clang \
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android23-clang \
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android23-clang
5 changes: 5 additions & 0 deletions ci/docker/i686-unknown-linux-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
FROM rust-i686-unknown-linux-gnu

# Install `perl-IPC-Cmd` to make OpenSSL v3 happy.
# See: <https://github.com/sfackler/rust-openssl/issues/1550>
RUN yum upgrade -y && \
yum install -y perl-IPC-Cmd
5 changes: 5 additions & 0 deletions ci/docker/x86_64-unknown-linux-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
FROM rust-x86_64-unknown-linux-gnu

# Install `perl-IPC-Cmd` to make OpenSSL v3 happy.
# See: <https://github.com/sfackler/rust-openssl/issues/1550>
RUN yum upgrade -y && \
yum install -y perl-IPC-Cmd
Loading