Skip to content

Commit 0b2f173

Browse files
committed
chore: sync with template, update dependencies, fix some clippy issues
1 parent 3162987 commit 0b2f173

File tree

8 files changed

+262
-189
lines changed

8 files changed

+262
-189
lines changed

.github/workflows/audit-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
audit-check:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-24.04
1010
permissions:
1111
checks: write
1212
issues: write

.github/workflows/ci.yml

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@ on:
55
workflow_dispatch:
66

77
env:
8+
CARGO_TERM_COLOR: always
89
CI: 1
910

1011
jobs:
1112
clippy:
12-
name: Clippy validation${{ matrix.all-features && ' with all features' || '' }}
13-
strategy:
14-
fail-fast: false
15-
matrix:
16-
all-features: [ false ]
17-
runs-on: ubuntu-latest
13+
name: Clippy validation
14+
runs-on: ubuntu-24.04
1815
steps:
1916
- name: Checkout code
2017
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -27,20 +24,21 @@ jobs:
2724
cache: false
2825

2926
- name: Rust Cache
30-
uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
27+
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
3128
with:
32-
prefix-key: v1-rust
33-
key: all-features-${{ matrix.all-features }}
29+
prefix-key: v2-rust
3430
cache-on-failure: true
3531

3632
- name: Run clippy
3733
uses: clechasseur/rs-clippy-check@23f6dcf86d7e4e0d98b000bba0bb81ac587c44aa # v4.0.2
3834
with:
39-
args: --workspace --all-targets ${{ matrix.all-features && '--all-features' || '' }} -- -D warnings
35+
args: --workspace --all-targets --feature-powerset -- -D warnings
36+
tool: cargo-hack
37+
cache-key: v1-clippy
4038

4139
fmt:
4240
name: Rustfmt check
43-
runs-on: ubuntu-latest
41+
runs-on: ubuntu-24.04
4442
steps:
4543
- name: Checkout code
4644
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -58,17 +56,14 @@ jobs:
5856
args: --all
5957

6058
build:
61-
name: Build for Rust ${{ matrix.toolchain }}${{ matrix.experimental && ' (experimental)' || '' }} on ${{ matrix.os }}${{ matrix.ignore-lock && ' without Cargo.lock' || '' }}${{ matrix.all-features && ' with all features' || '' }}
59+
name: Build for Rust ${{ matrix.toolchain }}${{ matrix.experimental && ' (experimental)' || '' }} on ${{ matrix.os }}${{ matrix.ignore-lock && ' without Cargo.lock' || '' }}
6260
strategy:
6361
fail-fast: false
6462
matrix:
6563
toolchain: [ 1.75.0, stable ]
66-
os: [ ubuntu ]
64+
os: [ ubuntu-24.04, macos-14, windows-2022 ]
6765
ignore-lock: [ false ]
68-
all-features: [ false ]
69-
include:
70-
- experimental: false
71-
runs-on: ${{ matrix.os }}-latest
66+
runs-on: ${{ matrix.os }}
7267
continue-on-error: ${{ matrix.experimental }}
7368
steps:
7469
- name: Checkout code
@@ -85,22 +80,21 @@ jobs:
8580
cache: false
8681

8782
- name: Rust Cache
88-
if: ${{ !matrix.experimental }}
89-
uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
83+
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
9084
with:
91-
prefix-key: v2-rust
92-
key: ignore-lock-${{ matrix.ignore-lock }}-all-features-${{ matrix.all-features }}
85+
prefix-key: v3-rust
86+
key: ignore-lock-${{ matrix.ignore-lock }}
9387
cache-on-failure: true
9488

95-
- name: Install just
96-
uses: taiki-e/install-action@3c8fc6eaa5fcff049bb133c1f540c6c2287a191f # v2.49.10
89+
- name: Install required tools
90+
uses: taiki-e/install-action@f1390fd0d8205ae79e5e57b1d1e300dceeb4163e # v2.49.44
9791
with:
98-
tool: just
92+
tool: just,cargo-hack
9993
env:
10094
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10195

102-
- name: Run checks
103-
run: just all_features=${{ matrix.all-features }} check
96+
- name: Run checks on feature powerset
97+
run: just check-powerset
10498

10599
- name: Run tests
106-
run: just all_features=${{ matrix.all-features }} test
100+
run: just test

.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ target*/
88
# These are backup files generated by rustfmt
99
**/*.rs.bk
1010

11-
# Files that exist while we run `cargo minimal-versions`/`cargo msrv`
12-
*.msrv-prep*.bak
13-
1411
# MSVC Windows builds of rustc generate these, which store debugging information
1512
*.pdb
1613

@@ -21,10 +18,15 @@ target*/
2118
# docker-compose.override.yml is meant to be local-only
2219
docker-compose.override.yml
2320

24-
# Profiling files generated by cargo-tarpaulin
21+
# Profiling files generated by cargo-tarpaulin and cargo-llvm-cov
2522
*.profraw
2623
cobertura.xml
2724
tarpaulin-report.*
25+
cov.json
26+
codecov.json
27+
28+
# Local environment overrides
29+
.env
2830

2931
# aocf input cache
3032
.aocf/cache

0 commit comments

Comments
 (0)