Skip to content

Commit

Permalink
chore: update to rust 1.60.0 & update Cargo.lock (denoland#14260)
Browse files Browse the repository at this point in the history
Co-authored-by: Bartek Iwańczuk <[email protected]>
Co-authored-by: Aaron O'Mullan <[email protected]>
  • Loading branch information
3 people committed May 12, 2022
1 parent 6fff813 commit 0ee76da
Show file tree
Hide file tree
Showing 6 changed files with 171 additions and 186 deletions.
25 changes: 12 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jobs:
env:
CARGO_TERM_COLOR: always
RUST_BACKTRACE: full
RUSTC_FORCE_INCREMENTAL: 1

steps:
- name: Configure git
Expand Down Expand Up @@ -160,15 +159,15 @@ jobs:
# to complete.
sudo apt-get remove --purge -y man-db
# Install clang-13, lld-13, and debootstrap.
echo "deb http:https://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" |
sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-focal-13.list
# Install clang-14, lld-14, and debootstrap.
echo "deb http:https://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" |
sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-focal-14.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
sudo apt-get install --no-install-recommends debootstrap \
clang-13 lld-13
clang-14 lld-14
# Create ubuntu-16.04 sysroot environment, which is used to avoid
# depending on a very recent version of glibc.
Expand All @@ -193,8 +192,8 @@ jobs:
CARGO_PROFILE_RELEASE_LTO=false
RUSTFLAGS<<__1
-C linker-plugin-lto=true
-C linker=clang-13
-C link-arg=-fuse-ld=lld-13
-C linker=clang-14
-C link-arg=-fuse-ld=lld-14
-C link-arg=--sysroot=/sysroot
-C link-arg=-Wl,--allow-shlib-undefined
-C link-arg=-Wl,--thinlto-cache-dir=$(pwd)/target/release/lto-cache
Expand All @@ -203,15 +202,15 @@ jobs:
__1
RUSTDOCFLAGS<<__1
-C linker-plugin-lto=true
-C linker=clang-13
-C link-arg=-fuse-ld=lld-13
-C linker=clang-14
-C link-arg=-fuse-ld=lld-14
-C link-arg=--sysroot=/sysroot
-C link-arg=-Wl,--allow-shlib-undefined
-C link-arg=-Wl,--thinlto-cache-dir=$(pwd)/target/release/lto-cache
-C link-arg=-Wl,--thinlto-cache-policy,cache_size_bytes=700m
${{ env.RUSTFLAGS }}
__1
CC=clang-13
CC=clang-14
CFLAGS=-flto=thin --sysroot=/sysroot
__0
Expand All @@ -236,7 +235,7 @@ jobs:
~/.cargo/registry/index
~/.cargo/registry/cache
~/.cargo/git/db
key: 13-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}
key: 14-cargo-home-${{ matrix.os }}-${{ hashFiles('Cargo.lock') }}

# In main branch, always creates fresh cache
- name: Cache build output (main)
Expand All @@ -252,7 +251,7 @@ jobs:
!./target/*/*.zip
!./target/*/*.tar.gz
key: |
13-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}
14-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ github.sha }}
# Restore cache from the latest 'main' branch build.
- name: Cache build output (PR)
Expand All @@ -268,7 +267,7 @@ jobs:
!./target/*/*.tar.gz
key: never_saved
restore-keys: |
13-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-
14-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-
# Don't save cache after building PRs or branches other than 'main'.
- name: Skip save cache (PR)
Expand Down
Loading

0 comments on commit 0ee76da

Please sign in to comment.