Skip to content

Commit daf8d13

Browse files
committed
chore: Rust 1.87.0
1 parent e294adc commit daf8d13

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

.github/workflows/ci.generate.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify";
55
// Bump this number when you want to purge the cache.
66
// Note: the tools/release/01_bump_crate_versions.ts script will update this version
77
// automatically via regex, so ensure that this line maintains this format.
8-
const cacheVersion = 57;
8+
const cacheVersion = 58;
99

1010
const ubuntuX86Runner = "ubuntu-24.04";
1111
const ubuntuX86XlRunner = "ubuntu-24.04-xl";
@@ -76,7 +76,7 @@ const prCachePath = [
7676
].join("\n");
7777

7878
// Note that you may need to add more version to the `apt-get remove` line below if you change this
79-
const llvmVersion = 19;
79+
const llvmVersion = 20;
8080
const installPkgsCommand =
8181
`sudo apt-get install --no-install-recommends clang-${llvmVersion} lld-${llvmVersion} clang-tools-${llvmVersion} clang-format-${llvmVersion} clang-tidy-${llvmVersion}`;
8282
const sysRootStep = {
@@ -85,10 +85,10 @@ const sysRootStep = {
8585
export DEBIAN_FRONTEND=noninteractive
8686
# Avoid running man-db triggers, which sometimes takes several minutes
8787
# to complete.
88-
sudo apt-get -qq remove --purge -y man-db > /dev/null 2> /dev/null
88+
sudo apt-get -qq remove --purge -y man-db > /dev/null 2> /dev/null
8989
# Remove older clang before we install
9090
sudo apt-get -qq remove \
91-
'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'clang-17*' 'clang-18*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'llvm-17*' 'llvm-18*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' 'lld-17*' 'lld-18*' > /dev/null 2> /dev/null
91+
'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'clang-17*' 'clang-18*' 'clang-19*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'llvm-17*' 'llvm-18*' 'llvm-19*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' 'lld-17*' 'lld-18*' 'lld-19*' > /dev/null 2> /dev/null
9292
9393
# Install clang-XXX, lld-XXX, and debootstrap.
9494
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${llvmVersion} main" |

.github/workflows/ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ jobs:
187187
~/.cargo/registry/index
188188
~/.cargo/registry/cache
189189
~/.cargo/git/db
190-
key: '57-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
191-
restore-keys: '57-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-'
190+
key: '58-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
191+
restore-keys: '58-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-'
192192
if: '!(matrix.skip)'
193193
- uses: dsherret/rust-toolchain-file@v1
194194
if: '!(matrix.skip)'
@@ -266,23 +266,23 @@ jobs:
266266
export DEBIAN_FRONTEND=noninteractive
267267
# Avoid running man-db triggers, which sometimes takes several minutes
268268
# to complete.
269-
sudo apt-get -qq remove --purge -y man-db > /dev/null 2> /dev/null
269+
sudo apt-get -qq remove --purge -y man-db > /dev/null 2> /dev/null
270270
# Remove older clang before we install
271-
sudo apt-get -qq remove 'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'clang-17*' 'clang-18*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'llvm-17*' 'llvm-18*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' 'lld-17*' 'lld-18*' > /dev/null 2> /dev/null
271+
sudo apt-get -qq remove 'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'clang-17*' 'clang-18*' 'clang-19*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'llvm-17*' 'llvm-18*' 'llvm-19*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' 'lld-17*' 'lld-18*' 'lld-19*' > /dev/null 2> /dev/null
272272
273273
# Install clang-XXX, lld-XXX, and debootstrap.
274-
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main" |
275-
sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-19.list
274+
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" |
275+
sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-20.list
276276
curl https://apt.llvm.org/llvm-snapshot.gpg.key |
277277
gpg --dearmor |
278278
sudo dd of=/etc/apt/trusted.gpg.d/llvm-snapshot.gpg
279279
sudo apt-get update
280280
# this was unreliable sometimes, so try again if it fails
281-
sudo apt-get install --no-install-recommends clang-19 lld-19 clang-tools-19 clang-format-19 clang-tidy-19 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install --no-install-recommends clang-19 lld-19 clang-tools-19 clang-format-19 clang-tidy-19
281+
sudo apt-get install --no-install-recommends clang-20 lld-20 clang-tools-20 clang-format-20 clang-tidy-20 || echo 'Failed. Trying again.' && sudo apt-get clean && sudo apt-get update && sudo apt-get install --no-install-recommends clang-20 lld-20 clang-tools-20 clang-format-20 clang-tidy-20
282282
# Fix alternatives
283283
(yes '' | sudo update-alternatives --force --all) > /dev/null 2> /dev/null || true
284284
285-
clang-19 -c -o /tmp/memfd_create_shim.o tools/memfd_create_shim.c -fPIC
285+
clang-20 -c -o /tmp/memfd_create_shim.o tools/memfd_create_shim.c -fPIC
286286
287287
echo "Decompressing sysroot..."
288288
wget -q https://github.com/denoland/deno_sysroot_build/releases/download/sysroot-20250207/sysroot-`uname -m`.tar.xz -O /tmp/sysroot.tar.xz
@@ -315,8 +315,8 @@ jobs:
315315
CARGO_PROFILE_RELEASE_INCREMENTAL=false
316316
RUSTFLAGS<<__1
317317
-C linker-plugin-lto=true
318-
-C linker=clang-19
319-
-C link-arg=-fuse-ld=lld-19
318+
-C linker=clang-20
319+
-C link-arg=-fuse-ld=lld-20
320320
-C link-arg=-ldl
321321
-C link-arg=-Wl,--allow-shlib-undefined
322322
-C link-arg=-Wl,--thinlto-cache-dir=$(pwd)/target/release/lto-cache
@@ -327,8 +327,8 @@ jobs:
327327
__1
328328
RUSTDOCFLAGS<<__1
329329
-C linker-plugin-lto=true
330-
-C linker=clang-19
331-
-C link-arg=-fuse-ld=lld-19
330+
-C linker=clang-20
331+
-C link-arg=-fuse-ld=lld-20
332332
-C link-arg=-ldl
333333
-C link-arg=-Wl,--allow-shlib-undefined
334334
-C link-arg=-Wl,--thinlto-cache-dir=$(pwd)/target/release/lto-cache
@@ -337,7 +337,7 @@ jobs:
337337
--cfg tokio_unstable
338338
$RUSTFLAGS
339339
__1
340-
CC=/usr/bin/clang-19
340+
CC=/usr/bin/clang-20
341341
CFLAGS=$CFLAGS
342342
" > $GITHUB_ENV
343343
- name: Remove macOS cURL --ipv4 flag
@@ -390,7 +390,7 @@ jobs:
390390
!./target/*/*.zip
391391
!./target/*/*.tar.gz
392392
key: never_saved
393-
restore-keys: '57-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
393+
restore-keys: '58-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
394394
- name: Apply and update mtime cache
395395
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
396396
uses: ./.github/mtime_cache
@@ -775,7 +775,7 @@ jobs:
775775
!./target/*/gn_root
776776
!./target/*/*.zip
777777
!./target/*/*.tar.gz
778-
key: '57-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
778+
key: '58-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
779779
wasm:
780780
name: build wasm32
781781
needs:

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.86.0"
2+
channel = "1.87.0"
33
components = ["rustfmt", "clippy"]

0 commit comments

Comments
 (0)