Skip to content

Commit f9e4567

Browse files
committed
Use preinstalled rust & stop incremental build
1 parent a6a7619 commit f9e4567

File tree

2 files changed

+15
-26
lines changed

2 files changed

+15
-26
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,32 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: [ubuntu-latest, macOS-latest, windows-latest]
14+
os: [ubuntu-latest, macos-latest, windows-latest]
15+
env:
16+
CARGO_INCREMENTAL: 0
1517
steps:
1618
- uses: actions/checkout@v6
17-
- uses: dtolnay/rust-toolchain@stable
1819
- run: cargo check
1920

2021
test:
2122
name: cargo test
2223
runs-on: ${{ matrix.os }}
2324
strategy:
2425
matrix:
25-
os: [ubuntu-latest, macOS-latest, windows-latest]
26+
os: [ubuntu-latest, macos-latest, windows-latest]
27+
env:
28+
CARGO_INCREMENTAL: 0
2629
steps:
2730
- uses: actions/checkout@v6
28-
- uses: dtolnay/rust-toolchain@stable
2931
- run: cargo test --all
3032

3133
fmt:
3234
name: cargo fmt --all -- --check
3335
runs-on: ubuntu-latest
36+
env:
37+
CARGO_INCREMENTAL: 0
3438
steps:
3539
- uses: actions/checkout@v6
36-
- uses: dtolnay/rust-toolchain@stable
37-
- run: rustup component add rustfmt
3840
- run: cargo fmt --all -- --check
3941

4042
coverage:
@@ -47,30 +49,22 @@ jobs:
4749
- { os: ubuntu-latest , features: unix }
4850
- { os: macos-latest , features: macos }
4951
- { os: windows-latest , features: windows }
52+
env:
53+
CARGO_INCREMENTAL: 0
5054
steps:
5155
- uses: actions/checkout@v6
5256
- name: Initialize workflow variables
5357
id: vars
5458
shell: bash
5559
run: |
60+
## Use nightly features
61+
echo "RUSTC_BOOTSTRAP=1" >> $GITHUB_OUTPUT
5662
## VARs setup
5763
outputs() { step_id="vars"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo "${var}=${!var}" >> $GITHUB_OUTPUT; done; }
58-
# toolchain
59-
TOOLCHAIN="nightly" ## default to "nightly" toolchain (required for certain required unstable compiler flags) ## !maint: refactor when stable channel has needed support
60-
# * specify gnu-type TOOLCHAIN for windows; `grcov` requires gnu-style code coverage data files
61-
case ${{ matrix.job.os }} in windows-*) TOOLCHAIN="$TOOLCHAIN-x86_64-pc-windows-gnu" ;; esac;
62-
# * use requested TOOLCHAIN if specified
63-
if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
64-
outputs TOOLCHAIN
6564
# target-specific options
6665
# * CODECOV_FLAGS
6766
CODECOV_FLAGS=$( echo "${{ matrix.job.os }}" | sed 's/[^[:alnum:]]/_/g' )
6867
outputs CODECOV_FLAGS
69-
70-
- name: rust toolchain ~ install
71-
uses: dtolnay/rust-toolchain@nightly
72-
with:
73-
components: llvm-tools-preview
7468
- name: Test
7569
run: cargo test --no-fail-fast
7670
env:

.github/workflows/code-quality.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,15 @@ jobs:
2424
style_format:
2525
name: Style/format
2626
runs-on: ${{ matrix.job.os }}
27+
env:
28+
CARGO_INCREMENTAL: 0
2729
strategy:
2830
fail-fast: false
2931
matrix:
3032
job:
3133
- { os: ubuntu-latest, features: feat_os_unix }
3234
steps:
3335
- uses: actions/checkout@v6
34-
- uses: dtolnay/rust-toolchain@master
35-
with:
36-
toolchain: stable
37-
components: rustfmt
3836
- uses: Swatinem/rust-cache@v2
3937
- name: Initialize workflow variables
4038
id: vars
@@ -65,6 +63,7 @@ jobs:
6563
env:
6664
SCCACHE_GHA_ENABLED: "true"
6765
RUSTC_WRAPPER: "sccache"
66+
CARGO_INCREMENTAL: 0
6867
strategy:
6968
fail-fast: false
7069
matrix:
@@ -74,10 +73,6 @@ jobs:
7473
- { os: windows-latest }
7574
steps:
7675
- uses: actions/checkout@v6
77-
- uses: dtolnay/rust-toolchain@master
78-
with:
79-
toolchain: stable
80-
components: clippy
8176
- uses: Swatinem/rust-cache@v2
8277
- name: Run sccache-cache
8378
uses: mozilla-actions/sccache-action@v0.0.9

0 commit comments

Comments
 (0)