From 7e91f74d2b00cdc64042ba66e45d912fa2d9b647 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Wed, 7 Jun 2023 17:02:43 -0400 Subject: [PATCH] chore: downgrade to Rust 1.69 (#19407) --- .github/workflows/ci.generate.ts | 20 ++++++++++---------- .github/workflows/ci.yml | 24 ++++++++++++------------ Cargo.lock | 9 +++++---- ext/ffi/Cargo.toml | 3 ++- rust-toolchain.toml | 2 +- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 59bada4fc4..2e99e3f9b7 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -5,7 +5,7 @@ import * as yaml from "https://deno.land/std@0.173.0/encoding/yaml.ts"; // Bump this number when you want to purge the cache. // Note: the tools/release/01_bump_crate_versions.ts script will update this version // automatically via regex, so ensure that this line maintains this format. -const cacheVersion = 34; +const cacheVersion = 35; const Runners = (() => { const ubuntuRunner = "ubuntu-22.04"; @@ -24,16 +24,16 @@ const prCacheKeyPrefix = `${cacheVersion}-cargo-target-\${{ matrix.os }}-\${{ matrix.profile }}-\${{ matrix.job }}-`; const installPkgsCommand = - "sudo apt-get install --no-install-recommends debootstrap clang-16 lld-16"; + "sudo apt-get install --no-install-recommends debootstrap clang-15 lld-15"; const sysRootStep = { name: "Set up incremental LTO and sysroot build", run: `# Avoid running man-db triggers, which sometimes takes several minutes # to complete. sudo apt-get remove --purge -y man-db -# Install clang-16, lld-16, and debootstrap. -echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | - sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-16.list +# Install clang-15, lld-15, and debootstrap. +echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main" | + sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-15.list curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo dd of=/etc/apt/trusted.gpg.d/llvm-snapshot.gpg @@ -70,8 +70,8 @@ CARGO_PROFILE_RELEASE_INCREMENTAL=false CARGO_PROFILE_RELEASE_LTO=false RUSTFLAGS<<__1 -C linker-plugin-lto=true - -C linker=clang-16 - -C link-arg=-fuse-ld=lld-16 + -C linker=clang-15 + -C link-arg=-fuse-ld=lld-15 -C link-arg=--sysroot=/sysroot -C link-arg=-ldl -C link-arg=-Wl,--allow-shlib-undefined @@ -81,8 +81,8 @@ RUSTFLAGS<<__1 __1 RUSTDOCFLAGS<<__1 -C linker-plugin-lto=true - -C linker=clang-16 - -C link-arg=-fuse-ld=lld-16 + -C linker=clang-15 + -C link-arg=-fuse-ld=lld-15 -C link-arg=--sysroot=/sysroot -C link-arg=-ldl -C link-arg=-Wl,--allow-shlib-undefined @@ -90,7 +90,7 @@ RUSTDOCFLAGS<<__1 -C link-arg=-Wl,--thinlto-cache-policy,cache_size_bytes=700m \${{ env.RUSTFLAGS }} __1 -CC=clang-16 +CC=clang-15 CFLAGS=-flto=thin --sysroot=/sysroot __0`, }; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ac0c2e243..690d98caf1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -210,15 +210,15 @@ jobs: # to complete. sudo apt-get remove --purge -y man-db - # Install clang-16, lld-16, and debootstrap. - echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | - sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-16.list + # Install clang-15, lld-15, and debootstrap. + echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main" | + sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-15.list curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo dd of=/etc/apt/trusted.gpg.d/llvm-snapshot.gpg sudo apt-get update # this was unreliable sometimes, so try again if it fails - sudo apt-get install --no-install-recommends debootstrap clang-16 lld-16 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install --no-install-recommends debootstrap clang-16 lld-16 + sudo apt-get install --no-install-recommends debootstrap clang-15 lld-15 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install --no-install-recommends debootstrap clang-15 lld-15 # Create ubuntu-16.04 sysroot environment, which is used to avoid # depending on a very recent version of glibc. @@ -249,8 +249,8 @@ jobs: CARGO_PROFILE_RELEASE_LTO=false RUSTFLAGS<<__1 -C linker-plugin-lto=true - -C linker=clang-16 - -C link-arg=-fuse-ld=lld-16 + -C linker=clang-15 + -C link-arg=-fuse-ld=lld-15 -C link-arg=--sysroot=/sysroot -C link-arg=-ldl -C link-arg=-Wl,--allow-shlib-undefined @@ -260,8 +260,8 @@ jobs: __1 RUSTDOCFLAGS<<__1 -C linker-plugin-lto=true - -C linker=clang-16 - -C link-arg=-fuse-ld=lld-16 + -C linker=clang-15 + -C link-arg=-fuse-ld=lld-15 -C link-arg=--sysroot=/sysroot -C link-arg=-ldl -C link-arg=-Wl,--allow-shlib-undefined @@ -269,7 +269,7 @@ jobs: -C link-arg=-Wl,--thinlto-cache-policy,cache_size_bytes=700m ${{ env.RUSTFLAGS }} __1 - CC=clang-16 + CC=clang-15 CFLAGS=-flto=thin --sysroot=/sysroot __0 - name: Log versions @@ -293,7 +293,7 @@ jobs: ~/.cargo/registry/index ~/.cargo/registry/cache ~/.cargo/git/db - key: '34-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}' + key: '35-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}' if: '!(github.event_name == ''pull_request'' && matrix.skip_pr)' - name: Restore cache build output (PR) uses: actions/cache/restore@v3 @@ -305,7 +305,7 @@ jobs: !./target/*/*.zip !./target/*/*.tar.gz key: never_saved - restore-keys: '34-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-' + restore-keys: '35-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-' - name: Apply and update mtime cache if: '!(github.event_name == ''pull_request'' && matrix.skip_pr) && (!startsWith(github.ref, ''refs/tags/''))' uses: ./.github/mtime_cache @@ -589,7 +589,7 @@ jobs: !./target/*/gn_out !./target/*/*.zip !./target/*/*.tar.gz - key: '34-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' + key: '35-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' publish-canary: name: publish canary runs-on: ubuntu-22.04 diff --git a/Cargo.lock b/Cargo.lock index f0721f433c..0372622ac2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1001,6 +1001,7 @@ dependencies = [ "dlopen", "dynasmrt", "libffi", + "libffi-sys", "serde", "serde-value", "serde_json", @@ -2787,9 +2788,9 @@ checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libffi" -version = "3.2.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2" +checksum = "6cb06d5b4c428f3cd682943741c39ed4157ae989fffe1094a08eaf7c4014cf60" dependencies = [ "libc", "libffi-sys", @@ -2797,9 +2798,9 @@ dependencies = [ [[package]] name = "libffi-sys" -version = "2.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36115160c57e8529781b4183c2bb51fdc1f6d6d1ed345591d84be7703befb3c" +checksum = "11c6f11e063a27ffe040a9d15f0b661bf41edc2383b7ae0e0ad5a7e7d53d9da3" dependencies = [ "cc", ] diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml index ae62c20631..a1d2a68c34 100644 --- a/ext/ffi/Cargo.toml +++ b/ext/ffi/Cargo.toml @@ -17,7 +17,8 @@ path = "lib.rs" deno_core.workspace = true dlopen.workspace = true dynasmrt = "1.2.3" -libffi = "3.2.0" +libffi = "=3.1.0" +libffi-sys = "=2.1.0" # temporary pin for downgrade to Rust 1.69 serde.workspace = true serde-value = "0.7" serde_json = "1.0" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f15cd1c929..f332202964 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.70.0" +channel = "1.69.0" components = ["rustfmt", "clippy"]