Skip to content

Commit c240fae

Browse files
committed
ci: simplify workflow and update dependencies
- Split fmt (nightly) and check (stable) into separate jobs - Remove sccache, keep only Swatinem/rust-cache - Update actions/checkout from v4 to v6 - Simplify deny.toml for cargo-deny v2 format
1 parent 8537643 commit c240fae

File tree

2 files changed

+16
-61
lines changed

2 files changed

+16
-61
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
rust: ${{ steps.filter.outputs.rust }}
3333
workflows: ${{ steps.filter.outputs.workflows }}
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v6
3636

3737
- uses: dorny/paths-filter@v3
3838
id: filter
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
timeout-minutes: 5
5757
steps:
58-
- uses: actions/checkout@v4
58+
- uses: actions/checkout@v6
5959

6060
- name: Install Rust nightly
6161
uses: dtolnay/rust-toolchain@nightly
@@ -73,7 +73,7 @@ jobs:
7373
runs-on: ubuntu-latest
7474
timeout-minutes: 10
7575
steps:
76-
- uses: actions/checkout@v4
76+
- uses: actions/checkout@v6
7777

7878
- name: Install Rust stable
7979
uses: dtolnay/rust-toolchain@stable
@@ -105,7 +105,7 @@ jobs:
105105
contents: read
106106
issues: write
107107
steps:
108-
- uses: actions/checkout@v4
108+
- uses: actions/checkout@v6
109109

110110
- name: Install cargo-binstall
111111
uses: cargo-bins/cargo-binstall@main
@@ -147,7 +147,7 @@ jobs:
147147
rust: beta
148148

149149
steps:
150-
- uses: actions/checkout@v4
150+
- uses: actions/checkout@v6
151151

152152
- name: Install Rust ${{ matrix.rust }}
153153
uses: dtolnay/rust-toolchain@master
@@ -161,22 +161,6 @@ jobs:
161161
sudo apt-get update
162162
sudo apt-get install -y libssl-dev pkg-config
163163
164-
- name: Setup sccache (Unix)
165-
if: matrix.os != 'windows-latest'
166-
uses: mozilla-actions/sccache-action@v0.0.8
167-
168-
- name: Setup sccache (Windows)
169-
if: matrix.os == 'windows-latest'
170-
uses: mozilla-actions/sccache-action@v0.0.8
171-
with:
172-
version: "v0.7.4"
173-
174-
- name: Configure sccache
175-
run: |
176-
echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
177-
echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
178-
shell: bash
179-
180164
- name: Cache Cargo
181165
uses: Swatinem/rust-cache@v2
182166
with:
@@ -198,10 +182,6 @@ jobs:
198182
- name: Run doctests
199183
run: cargo test --workspace --doc --all-features
200184

201-
- name: sccache stats
202-
run: sccache --show-stats
203-
shell: bash
204-
205185
# Code coverage (Linux only for speed)
206186
coverage:
207187
name: Code Coverage
@@ -210,7 +190,7 @@ jobs:
210190
runs-on: ubuntu-latest
211191
timeout-minutes: 20
212192
steps:
213-
- uses: actions/checkout@v4
193+
- uses: actions/checkout@v6
214194

215195
- name: Install Rust
216196
uses: dtolnay/rust-toolchain@stable
@@ -256,7 +236,7 @@ jobs:
256236
runs-on: ubuntu-latest
257237
timeout-minutes: 15
258238
steps:
259-
- uses: actions/checkout@v4
239+
- uses: actions/checkout@v6
260240

261241
- name: Read MSRV from Cargo.toml
262242
id: msrv
@@ -285,7 +265,7 @@ jobs:
285265
runs-on: ubuntu-latest
286266
timeout-minutes: 15
287267
steps:
288-
- uses: actions/checkout@v4
268+
- uses: actions/checkout@v6
289269

290270
- name: Install Rust
291271
uses: dtolnay/rust-toolchain@stable
@@ -313,7 +293,7 @@ jobs:
313293
runs-on: ubuntu-latest
314294
timeout-minutes: 30
315295
steps:
316-
- uses: actions/checkout@v4
296+
- uses: actions/checkout@v6
317297

318298
- name: Install Rust
319299
uses: dtolnay/rust-toolchain@stable
@@ -340,19 +320,11 @@ jobs:
340320
runs-on: ubuntu-latest
341321
timeout-minutes: 20
342322
steps:
343-
- uses: actions/checkout@v4
323+
- uses: actions/checkout@v6
344324

345325
- name: Install Rust
346326
uses: dtolnay/rust-toolchain@stable
347327

348-
- name: Setup sccache
349-
uses: mozilla-actions/sccache-action@v0.0.8
350-
351-
- name: Configure sccache
352-
run: |
353-
echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
354-
echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
355-
356328
- name: Cache Cargo
357329
uses: Swatinem/rust-cache@v2
358330
with:

deny.toml

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,36 @@
11
# cargo-deny configuration
2-
# See: https://embarkstudios.github.io/cargo-deny/
2+
# https://embarkstudios.github.io/cargo-deny/
33

44
[advisories]
55
version = 2
6-
db-path = "~/.cargo/advisory-db"
7-
db-urls = ["https://github.com/rustsec/advisory-db"]
86
ignore = []
97

108
[licenses]
119
version = 2
12-
unlicensed = "deny"
1310
allow = [
1411
"MIT",
1512
"Apache-2.0",
1613
"Apache-2.0 WITH LLVM-exception",
1714
"BSD-2-Clause",
1815
"BSD-3-Clause",
1916
"ISC",
17+
"Unicode-3.0",
2018
"Unicode-DFS-2016",
2119
"Zlib",
2220
"0BSD",
2321
]
24-
deny = [
25-
"GPL-2.0",
26-
"GPL-3.0",
27-
"AGPL-3.0",
28-
]
29-
copyleft = "warn"
30-
allow-osi-fsf-free = "neither"
31-
default = "deny"
32-
confidence-threshold = 0.8
3322

34-
[[licenses.exceptions]]
35-
allow = ["Unicode-3.0"]
36-
name = "unicode-ident"
23+
[[licenses.clarify]]
24+
name = "ring"
25+
expression = "MIT AND ISC AND OpenSSL"
26+
license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
3727

3828
[bans]
3929
multiple-versions = "warn"
4030
wildcards = "allow"
4131
highlight = "all"
42-
workspace-default-features = "allow"
43-
external-default-features = "allow"
44-
allow = []
45-
deny = []
46-
skip = []
47-
skip-tree = []
4832

4933
[sources]
5034
unknown-registry = "deny"
5135
unknown-git = "deny"
5236
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
53-
allow-git = []

0 commit comments

Comments
 (0)