Skip to content

Commit fa771da

Browse files
Use vanilla rustup in CI (wip)
1 parent f6e0941 commit fa771da

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/nightly.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ jobs:
1414
- uses: actions/checkout@v4
1515
with:
1616
ref: stable
17-
- uses: dtolnay/rust-toolchain@stable
18-
with:
19-
toolchain: nightly
17+
- name: Set up Rust toolchain
18+
run: rustup toolchain install --no-self-update --profile minimal nightly
2019
- name: Build
21-
run: cargo build --all
20+
run: cargo +nightly build --all
2221
- name: Generate self-profile
2322
run: RUSTFLAGS="-Zself-profile" cargo +nightly build --bin crox
2423
- name: Check crox

.github/workflows/rust.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@ jobs:
1717
build:
1818
strategy:
1919
matrix:
20-
rust_channel: [ stable, beta, nightly ]
20+
rust: [ stable, beta, nightly ]
2121
include:
22-
- rust_channel: nightly
22+
- rust: nightly
2323
check_cfg: '-Zcheck-cfg'
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v4
27-
- uses: dtolnay/rust-toolchain@stable
28-
with:
29-
toolchain: ${{ matrix.rust_channel }}
27+
- name: Set up Rust toolchain
28+
run: |
29+
rustup toolchain install --no-self-update --profile minimal ${{ matrix.rust }}
30+
rustup default ${{ matrix.rust }}
3031
# Add a big endian target so we can check that everything at least
3132
# compiles on big endian.
32-
targets: powerpc64-unknown-linux-gnu
33+
rustup target add --toolchain ${{ matrix.rust }} powerpc64-unknown-linux-gnu
3334
- name: Build
3435
run: cargo build --verbose --all ${{ matrix.check_cfg }}
3536
- name: Run tests

0 commit comments

Comments
 (0)