Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

Commit 3f2db72

Browse files
authored
Merge pull request #334 from tgross35/ci-cleanup
ci: `rustup --no-self-update` and reuqire MSRV checks
2 parents 385e41c + 2fde002 commit 3f2db72

File tree

1 file changed

+33
-30
lines changed

1 file changed

+33
-30
lines changed

.github/workflows/main.yml

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,44 +29,19 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@master
3131
- name: Install Rust
32-
run: rustup update nightly && rustup default nightly
32+
run: rustup update nightly --no-self-update && rustup default nightly
3333
- run: rustup target add ${{ matrix.target }}
3434
- run: rustup target add x86_64-unknown-linux-musl
3535
- run: cargo generate-lockfile
3636
- run: ./ci/run-docker.sh ${{ matrix.target }}
3737

38-
msrv:
39-
name: Check MSRV
40-
runs-on: ubuntu-latest
41-
env:
42-
RUSTFLAGS: # No need to check warnings on old MSRV, unset `-Dwarnings`
43-
steps:
44-
- uses: actions/checkout@master
45-
- run: |
46-
msrv="$(perl -ne 'print if s/rust-version\s*=\s*"(.*)"/\1/g' Cargo.toml)"
47-
echo "MSRV: $msrv"
48-
echo "MSRV=$msrv" >> "$GITHUB_ENV"
49-
- name: Install Rust
50-
run: rustup update "$MSRV" && rustup default "$MSRV"
51-
- run: cargo build -p libm
52-
53-
54-
rustfmt:
55-
name: Rustfmt
56-
runs-on: ubuntu-latest
57-
steps:
58-
- uses: actions/checkout@master
59-
- name: Install Rust
60-
run: rustup update nightly && rustup default nightly && rustup component add rustfmt
61-
- run: cargo fmt -- --check
62-
6338
wasm:
6439
name: WebAssembly
6540
runs-on: ubuntu-latest
6641
steps:
6742
- uses: actions/checkout@master
6843
- name: Install Rust
69-
run: rustup update nightly && rustup default nightly
44+
run: rustup update nightly --no-self-update && rustup default nightly
7045
- run: rustup target add wasm32-unknown-unknown
7146
- run: cargo build --target wasm32-unknown-unknown
7247

@@ -76,7 +51,7 @@ jobs:
7651
steps:
7752
- uses: actions/checkout@master
7853
- name: Install Rust
79-
run: rustup update nightly && rustup default nightly
54+
run: rustup update nightly --no-self-update && rustup default nightly
8055
- run: cargo build -p cb
8156

8257
benchmarks:
@@ -85,16 +60,44 @@ jobs:
8560
steps:
8661
- uses: actions/checkout@master
8762
- name: Install Rust
88-
run: rustup update nightly && rustup default nightly
63+
run: rustup update nightly --no-self-update && rustup default nightly
8964
- run: cargo bench --all
9065

66+
msrv:
67+
name: Check MSRV
68+
runs-on: ubuntu-latest
69+
env:
70+
RUSTFLAGS: # No need to check warnings on old MSRV, unset `-Dwarnings`
71+
steps:
72+
- uses: actions/checkout@master
73+
- run: |
74+
msrv="$(perl -ne 'print if s/rust-version\s*=\s*"(.*)"/\1/g' Cargo.toml)"
75+
echo "MSRV: $msrv"
76+
echo "MSRV=$msrv" >> "$GITHUB_ENV"
77+
- name: Install Rust
78+
run: rustup update "$MSRV" --no-self-update && rustup default "$MSRV"
79+
- run: cargo build -p libm
80+
81+
rustfmt:
82+
name: Rustfmt
83+
runs-on: ubuntu-latest
84+
steps:
85+
- uses: actions/checkout@master
86+
- name: Install Rust
87+
run: |
88+
rustup update nightly --no-self-update
89+
rustup default nightly
90+
rustup component add rustfmt
91+
- run: cargo fmt -- --check
92+
9193
success:
9294
needs:
9395
- docker
94-
- rustfmt
9596
- wasm
9697
- cb
9798
- benchmarks
99+
- msrv
100+
- rustfmt
98101
runs-on: ubuntu-latest
99102
# GitHub branch protection is exceedingly silly and treats "jobs skipped because a dependency
100103
# failed" as success. So we have to do some contortions to ensure the job fails if any of its

0 commit comments

Comments
 (0)