Skip to content
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:

# Since we use rustc_codegen_gcc from the master branch of the repo, but don't use y.sh in make to build using rustc_codegen_gcc,
# we need to override the rust version.
rust_version=$(grep channel rustc_codegen_gcc/rust-toolchain | cut -f3 -d' ' | sed 's/"//g')
rust_version=$(grep channel rustc_codegen_gcc/rust-toolchain.toml | cut -f3 -d' ' | sed 's/"//g')
rustup override set $rust_version
rustup component add clippy rustfmt

Expand All @@ -141,7 +141,7 @@ jobs:

cd rustc_codegen_gcc
echo 'gcc-path = "/usr/lib"' > config.toml
#sed -i '/channel/d' rust-toolchain
#sed -i '/channel/d' rust-toolchain.toml
export RUSTC_BOOTSTRAP=1
./y.sh prepare --only-libcore
./y.sh build --sysroot --release
Expand Down
Loading