From 04f68fddd948657c817eca898b4b3c13cb9c3f21 Mon Sep 17 00:00:00 2001 From: Hocuri Date: Mon, 19 Dec 2022 12:41:19 +0100 Subject: [PATCH 1/2] Go back to Rust 1.61 as 1.65 makes the iOS build fail. For Android, it would actually be enough to go back to 1.64, but let's try what's needed for iOS. --- .github/workflows/ci.yml | 4 ++-- rust-toolchain | 2 +- scripts/coredeps/install-rust.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 173b342eac..43e765a77e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,10 +71,10 @@ jobs: include: # Currently used Rust version, same as in `rust-toolchain` file. - os: ubuntu-latest - rust: 1.65.0 + rust: 1.61.0 python: 3.9 - os: windows-latest - rust: 1.65.0 + rust: 1.61.0 python: false # Python bindings compilation on Windows is not supported. # Minimum Supported Rust Version = 1.61.0 diff --git a/rust-toolchain b/rust-toolchain index 902c74186f..91951fd8ad 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.65.0 +1.61.0 diff --git a/scripts/coredeps/install-rust.sh b/scripts/coredeps/install-rust.sh index dcbf30b77f..b2063da8c0 100755 --- a/scripts/coredeps/install-rust.sh +++ b/scripts/coredeps/install-rust.sh @@ -7,7 +7,7 @@ set -euo pipefail # # Avoid using rustup here as it depends on reading /proc/self/exe and # has problems running under QEMU. -RUST_VERSION=1.65.0 +RUST_VERSION=1.61.0 ARCH="$(uname -m)" test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu From d722b6ba19e70a4aa2fc6854f112a396aec48f7f Mon Sep 17 00:00:00 2001 From: Hocuri Date: Mon, 19 Dec 2022 17:15:17 +0100 Subject: [PATCH 2/2] Only go to 1.64 for now --- .github/workflows/ci.yml | 4 ++-- rust-toolchain | 2 +- scripts/coredeps/install-rust.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43e765a77e..5b1d28fafd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,10 +71,10 @@ jobs: include: # Currently used Rust version, same as in `rust-toolchain` file. - os: ubuntu-latest - rust: 1.61.0 + rust: 1.64.0 python: 3.9 - os: windows-latest - rust: 1.61.0 + rust: 1.64.0 python: false # Python bindings compilation on Windows is not supported. # Minimum Supported Rust Version = 1.61.0 diff --git a/rust-toolchain b/rust-toolchain index 91951fd8ad..9405730420 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.61.0 +1.64.0 diff --git a/scripts/coredeps/install-rust.sh b/scripts/coredeps/install-rust.sh index b2063da8c0..b4a08f3f10 100755 --- a/scripts/coredeps/install-rust.sh +++ b/scripts/coredeps/install-rust.sh @@ -7,7 +7,7 @@ set -euo pipefail # # Avoid using rustup here as it depends on reading /proc/self/exe and # has problems running under QEMU. -RUST_VERSION=1.61.0 +RUST_VERSION=1.64.0 ARCH="$(uname -m)" test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu