Skip to content

Commit 920718c

Browse files
committed
Overhaul GH actions config.
Seems like actions-rs is entirely deprecated. Checkout v4 update doesn't seem to do much. This consolidates all non-minimal-MSRV tests to just testing 1.67.1 with the full regular test suite. I believe that should work well.
1 parent b189753 commit 920718c

File tree

1 file changed

+29
-144
lines changed

1 file changed

+29
-144
lines changed

.github/workflows/rust.yml

Lines changed: 29 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ name: tests
22

33
on:
44
push:
5-
branches: main
65
pull_request:
7-
branches: main
86

97
env:
108
CARGO_TERM_COLOR: always
@@ -21,64 +19,26 @@ jobs:
2119
os:
2220
- ubuntu-latest
2321
- windows-latest
22+
toolchain:
23+
- stable
24+
- 1.67.1
2425
steps:
25-
- uses: actions/checkout@v2
26-
- uses: actions-rs/toolchain@v1
27-
with:
28-
profile: minimal
29-
toolchain: ${{ matrix.rust }}
30-
override: true
31-
- uses: actions-rs/cargo@v1
32-
with:
33-
command: build
34-
args: --lib --bins --examples --tests --benches
35-
- uses: actions-rs/cargo@v1
36-
with:
37-
command: build
38-
args: --lib --bins --examples --tests --benches --all-features
39-
- uses: actions-rs/cargo@v1
40-
with:
41-
command: test
42-
- uses: actions-rs/cargo@v1
43-
with:
44-
command: test
45-
args: --no-default-features
46-
- uses: actions-rs/cargo@v1
47-
with:
48-
command: test
49-
args: --features=colored
50-
- uses: actions-rs/cargo@v1
51-
with:
52-
command: test
53-
args: --features=syslog-3
54-
- uses: actions-rs/cargo@v1
55-
with:
56-
command: test
57-
args: --features=syslog-4
58-
- uses: actions-rs/cargo@v1
59-
with:
60-
command: test
61-
args: --features=syslog-6
62-
- uses: actions-rs/cargo@v1
63-
with:
64-
command: test
65-
args: --features=syslog-7
66-
- uses: actions-rs/cargo@v1
67-
with:
68-
command: test
69-
args: --features=reopen-03
70-
- uses: actions-rs/cargo@v1
71-
with:
72-
command: test
73-
args: --features=reopen-1
74-
- uses: actions-rs/cargo@v1
75-
with:
76-
command: test
77-
args: --features=meta-logging-in-format
78-
- uses: actions-rs/cargo@v1
79-
with:
80-
command: test
81-
args: --all-features
26+
- uses: actions/checkout@v4
27+
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
28+
- run: cargo build --all-targets
29+
- run: cargo build --all-targets --no-default-features
30+
- run: cargo build --all-targets --all-features
31+
- run: cargo test
32+
- run: cargo test --no-default-features
33+
- run: cargo test --features=colored
34+
- run: cargo test --features=syslog-3
35+
- run: cargo test --features=syslog-4
36+
- run: cargo test --features=syslog-6
37+
- run: cargo test --features=syslog-7
38+
- run: cargo test --features=reopen-03
39+
- run: cargo test --features=reopen-1
40+
- run: cargo test --features=meta-logging-in-format
41+
- run: cargo test --all-features
8242
- run: cargo run --example cmd-program
8343
- run: cargo run --example cmd-program -- --verbose
8444
- run: cargo run --example colored --features colored
@@ -97,13 +57,12 @@ jobs:
9757
rust:
9858
- stable
9959
- beta
60+
toolchain:
61+
- stable
62+
- 1.67.1
10063
steps:
101-
- uses: actions/checkout@v2
102-
- uses: actions-rs/toolchain@v1
103-
with:
104-
profile: minimal
105-
toolchain: ${{ matrix.rust }}
106-
override: true
64+
- uses: actions/checkout@v4
65+
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
10766
- run: cargo run --example syslog3 --features syslog-3
10867
- run: cargo run --example syslog4 --features syslog-4
10968
- run: cargo run --example syslog --features syslog-6
@@ -117,88 +76,14 @@ jobs:
11776
- ubuntu-latest
11877
- windows-latest
11978
steps:
120-
- uses: actions/checkout@v2
121-
- uses: actions-rs/toolchain@v1
122-
with:
123-
profile: minimal
124-
# when updating this, also update rust-version in Cargo.toml
125-
toolchain: 1.60.0
126-
override: true
79+
- uses: actions/checkout@v4
80+
- run: rustup update 1.60.0 && rustup default 1.60.0
12781
- run: cargo build
128-
msrv2:
129-
name: MSRV Compatability - fern/date-based
130-
runs-on: ${{ matrix.os }}
131-
strategy:
132-
matrix:
133-
os:
134-
- ubuntu-latest
135-
- windows-latest
136-
steps:
137-
- uses: actions/checkout@v2
138-
- uses: actions-rs/toolchain@v1
139-
with:
140-
profile: minimal
141-
toolchain: 1.63.0
142-
override: true
143-
- run: cargo build --features date-based
144-
- run: cargo build --features reopen-1,reopen-03,meta-logging-in-format,syslog-3
145-
msrv_syslog_4:
146-
name: MSRV Compatability - fern/syslog-4
147-
runs-on: ${{ matrix.os }}
148-
strategy:
149-
matrix:
150-
os:
151-
- ubuntu-latest
152-
- windows-latest
153-
steps:
154-
- uses: actions/checkout@v2
155-
- uses: actions-rs/toolchain@v1
156-
with:
157-
profile: minimal
158-
toolchain: 1.65.0
159-
override: true
160-
- run: cargo build --features syslog-4
161-
msrv_syslog_6:
162-
name: MSRV Compatability - fern/syslog-6
163-
runs-on: ${{ matrix.os }}
164-
strategy:
165-
matrix:
166-
os:
167-
- ubuntu-latest
168-
- windows-latest
169-
steps:
170-
- uses: actions/checkout@v2
171-
- uses: actions-rs/toolchain@v1
172-
with:
173-
profile: minimal
174-
toolchain: 1.67.1
175-
override: true
176-
- run: cargo build --features syslog-6
177-
msrv_syslog_7:
178-
name: MSRV Compatability - fern/syslog-7
179-
runs-on: ${{ matrix.os }}
180-
strategy:
181-
matrix:
182-
os:
183-
- ubuntu-latest
184-
- windows-latest
185-
steps:
186-
- uses: actions/checkout@v2
187-
- uses: actions-rs/toolchain@v1
188-
with:
189-
profile: minimal
190-
toolchain: 1.67.1
191-
override: true
192-
- run: cargo build --features syslog-7
193-
fmt_and_clippy:
82+
optional_lints:
19483
name: Optional Lints
19584
runs-on: ubuntu-latest
19685
steps:
197-
- uses: actions/checkout@v2
198-
- uses: actions-rs/toolchain@v1
199-
with:
200-
profile: minimal
201-
toolchain: stable
202-
override: true
86+
- uses: actions/checkout@v4
87+
- run: rustup update stable && rustup default stable
20388
- run: cargo fmt --check
20489
- run: cargo clippy --all-features --all-targets -- -D warnings

0 commit comments

Comments
 (0)