Skip to content
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

Jump to bottom

chore: upgrade to rust 1.82 and LLVM 19 #26615

Merged
merged 20 commits into from
Nov 1, 2024
Merged

chore: upgrade to rust 1.82 and LLVM 19 #26615

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
010656d
LLVM 19
littledivy Oct 29, 2024
354adde
Copy stuff
littledivy Oct 29, 2024
9c4b0f4
s/12/13
littledivy Oct 29, 2024
96d7e36
Oops
littledivy Oct 29, 2024
5900558
Try this
littledivy Oct 29, 2024
b8d6054
x
littledivy Oct 29, 2024
2235d06
hfg
littledivy Oct 29, 2024
d80e171
x
littledivy Oct 29, 2024
53236f9
x
littledivy Oct 29, 2024
286cd3c
try this
littledivy Oct 29, 2024
22c380e
This might work
littledivy Oct 29, 2024
f7d3721
This might work
littledivy Oct 29, 2024
64234d6
Update toolchain
littledivy Oct 29, 2024
450f7b5
Update rust
littledivy Oct 29, 2024
45185e1
Update ci.generate.ts
littledivy Oct 29, 2024
7e13331
Remote webgpu test
littledivy Oct 29, 2024
1cb27d4
Review
littledivy Oct 30, 2024
e48d7ed
use jammy
littledivy Oct 30, 2024
83e838c
Use new sysroot
littledivy Oct 30, 2024
92aeeda
Use latest sysroot
littledivy Oct 30, 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
Prev Previous commit
Next Next commit
Update ci.generate.ts
  • Loading branch information
@littledivy
littledivy committed Oct 29, 2024
commit 45185e1cf899decc660911060fa993d83bdf9554
19 changes: 12 additions & 7 deletions .github/workflows/ci.generate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify";
// 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 = 22;
const cacheVersion = 23;

const ubuntuX86Runner = "ubuntu-22.04";
const ubuntuX86XlRunner = "ubuntu-22.04-xl";
const ubuntuX86Runner = "ubuntu-24.04";
const ubuntuX86XlRunner = "ubuntu-24.04-xl";
const ubuntuARMRunner = "ubicloud-standard-16-arm";
const windowsX86Runner = "windows-2022";
const windowsX86XlRunner = "windows-2022-xl";
Expand Down Expand Up @@ -59,9 +59,9 @@ const prCacheKeyPrefix =
`${cacheVersion}-cargo-target-\${{ matrix.os }}-\${{ matrix.arch }}-\${{ matrix.profile }}-\${{ matrix.job }}-`;

// Note that you may need to add more version to the `apt-get remove` line below if you change this
const llvmVersion = 18;
const llvmVersion = 19;
const installPkgsCommand =
`sudo apt-get install --no-install-recommends clang-${llvmVersion} lld-${llvmVersion} clang-tools-${llvmVersion} clang-format-${llvmVersion} clang-tidy-${llvmVersion}`;
`sudo apt-get install --no-install-recommends clang-${llvmVersion} lld-${llvmVersion} clang-tools-${llvmVersion} clang-format-${llvmVersion} clang-tidy-${llvmVersion} build-essential`;
littledivy marked this conversation as resolved.
Show resolved Hide resolved
const sysRootStep = {
name: "Set up incremental LTO and sysroot build",
run: `# Setting up sysroot
Expand All @@ -71,7 +71,7 @@ export DEBIAN_FRONTEND=noninteractive
sudo apt-get -qq remove --purge -y man-db > /dev/null 2> /dev/null
# Remove older clang before we install
sudo apt-get -qq remove \
'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' > /dev/null 2> /dev/null
'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'clang-17*' 'clang-18*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' 'lld-17*' 'lld-18*' > /dev/null 2> /dev/null

# Install clang-XXX, lld-XXX, and debootstrap.
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${llvmVersion} main" |
Expand Down Expand Up @@ -105,6 +105,11 @@ echo "sysroot env:"
cat /sysroot/.env
. /sysroot/.env

GCC_DIR=\`find /usr/lib -name "crtbeginS.o" -print -quit | xargs dirname\`
echo "GCC_DIR=$GCC_DIR"

sudo cp -R $GCC_DIR/** /sysroot/usr/lib/
satyarohith marked this conversation as resolved.
Show resolved Hide resolved

# Important notes:
# 1. -ldl seems to be required to avoid a failure in FFI tests. This flag seems
# to be in the Rust default flags in the smoketest, so uncertain why we need
Expand Down Expand Up @@ -678,7 +683,7 @@ const ci = {
run: [
// output fs space before and after building
"df -h",
"cargo build --locked --all-targets",
"cargo build -vv --locked --all-targets",
littledivy marked this conversation as resolved.
Show resolved Hide resolved
"df -h",
].join("\n"),
env: { CARGO_PROFILE_DEV_DEBUG: 0 },
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ jobs:
# to complete.
sudo apt-get -qq remove --purge -y man-db > /dev/null 2> /dev/null
# Remove older clang before we install
sudo apt-get -qq remove 'clang-12*' 'clang-13*' 'clang-14*' 'clang-15*' 'clang-16*' 'clang-17*' 'llvm-12*' 'llvm-13*' 'llvm-14*' 'llvm-15*' 'llvm-16*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' 'lld-17*' > /dev/null 2> /dev/null
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*' 'lld-12*' 'lld-13*' 'lld-14*' 'lld-15*' 'lld-16*' 'lld-17*' 'lld-18*' > /dev/null 2> /dev/null

# Install clang-XXX, lld-XXX, and debootstrap.
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main" |
Expand All @@ -274,7 +274,6 @@ jobs:
sudo mount --rbind /sys /sysroot/sys
sudo mount --rbind /home /sysroot/home
sudo mount -t proc /proc /sysroot/proc

cd

echo "Done."
Expand Down
Loading