Skip to content

Commit 77a447e

Browse files
build(deps): bump the cargo group across 1 directory with 6 updates (#176)
* build(deps): bump the cargo group across 1 directory with 6 updates Bumps the cargo group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [clap](https://github.com/clap-rs/clap) | `4.5.45` | `4.5.46` | | [fast-glob](https://github.com/oxc-project/fast-glob) | `0.4.5` | `1.0.0` | | [quick-xml](https://github.com/tafia/quick-xml) | `0.38.1` | `0.38.3` | | [regex](https://github.com/rust-lang/regex) | `1.11.1` | `1.11.2` | | [tempfile](https://github.com/Stebalien/tempfile) | `3.20.0` | `3.21.0` | | [pyo3](https://github.com/pyo3/pyo3) | `0.25.1` | `0.26.0` | Updates `clap` from 4.5.45 to 4.5.46 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@clap_complete-v4.5.45...clap_complete-v4.5.46) Updates `fast-glob` from 0.4.5 to 1.0.0 - [Release notes](https://github.com/oxc-project/fast-glob/releases) - [Changelog](https://github.com/oxc-project/fast-glob/blob/main/CHANGELOG.md) - [Commits](oxc-project/fast-glob@v0.4.5...v1.0.0) Updates `quick-xml` from 0.38.1 to 0.38.3 - [Release notes](https://github.com/tafia/quick-xml/releases) - [Changelog](https://github.com/tafia/quick-xml/blob/master/Changelog.md) - [Commits](tafia/quick-xml@v0.38.1...v0.38.3) Updates `regex` from 1.11.1 to 1.11.2 - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](rust-lang/regex@1.11.1...1.11.2) Updates `tempfile` from 3.20.0 to 3.21.0 - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](Stebalien/tempfile@v3.20.0...v3.21.0) Updates `pyo3` from 0.25.1 to 0.26.0 - [Release notes](https://github.com/pyo3/pyo3/releases) - [Changelog](https://github.com/PyO3/pyo3/blob/main/CHANGELOG.md) - [Commits](PyO3/pyo3@v0.25.1...v0.26.0) --- updated-dependencies: - dependency-name: clap dependency-version: 4.5.46 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo - dependency-name: fast-glob dependency-version: 1.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: cargo - dependency-name: quick-xml dependency-version: 0.38.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo - dependency-name: regex dependency-version: 1.11.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo - dependency-name: tempfile dependency-version: 3.21.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo - dependency-name: pyo3 dependency-version: 0.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo ... Signed-off-by: dependabot[bot] <[email protected]> * adjust test CI matrix for supported clang versions * use llvm-cov to generate HTML coverage report * fix clippy lints and make CI fail on lint warnings * auto-cancel benchmark run when superseded --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brendan <[email protected]>
1 parent f481ec2 commit 77a447e

File tree

10 files changed

+80
-55
lines changed

10 files changed

+80
-55
lines changed

.github/install-clang-action/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ runs:
3333
shell: bash
3434
continue-on-error: true
3535
run: |
36+
brew update
3637
brew install llvm@${{ inputs.version }}
3738
ln -s "$(brew --prefix llvm@${{ inputs.version }})/bin/clang-format" "/usr/local/bin/clang-format-${{ inputs.version }}"
3839
ln -s "$(brew --prefix llvm@${{ inputs.version }})/bin/clang-tidy" "/usr/local/bin/clang-tidy-${{ inputs.version }}"

.github/workflows/benchmark.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ on:
2424
# performance analysis in order to generate initial data.
2525
workflow_dispatch:
2626

27+
# This CI workflow can take up to 2 hours.
28+
# This setting will auto-cancel a old run if a new run is started.
29+
concurrency:
30+
group: ${{ github.workflow }}-${{ github.ref }}
31+
cancel-in-progress: true
32+
2733
jobs:
2834
benchmark:
2935
runs-on: ubuntu-latest

.github/workflows/pre-commit-hooks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
path: ~/.cargo
2727
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
2828
- name: cargo clippy
29-
run: cargo clippy
29+
run: cargo clippy -- -D warnings
3030
- name: cargo fmt
3131
run: cargo fmt --check
3232

.github/workflows/run-dev-tests.yml

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ jobs:
5252
with:
5353
tool: cargo-nextest,cargo-llvm-cov,cargo-binstall
5454

55-
- name: Install llvm-cov-pretty (HTML report generator)
56-
run: cargo binstall -y llvm-cov-pretty
57-
5855
- uses: actions/setup-python@v5
5956
with:
6057
python-version: 3.x
@@ -84,18 +81,6 @@ jobs:
8481
- if: runner.os == 'Linux'
8582
run: sudo apt-get update
8683

87-
- name: Install clang v8
88-
if: runner.os == 'Linux'
89-
uses: ./.github/install-clang-action
90-
with:
91-
version: '8'
92-
93-
- name: Collect Coverage for clang v8
94-
if: runner.os == 'Linux'
95-
env:
96-
CLANG_VERSION: '8'
97-
run: uvx nox -s test -- --profile ci
98-
9984
- name: Install clang v9
10085
uses: ./.github/install-clang-action
10186
with:
@@ -194,21 +179,55 @@ jobs:
194179
- name: Collect Coverage for clang v18
195180
env:
196181
CLANG_VERSION: '18'
182+
run: uvx nox -s test -- --profile ci
183+
184+
- name: Install clang v19
185+
if: runner.os == 'Linux'
186+
uses: ./.github/install-clang-action
187+
with:
188+
version: '19'
189+
190+
- name: Collect Coverage for clang v19
191+
if: runner.os == 'Linux'
192+
env:
193+
CLANG_VERSION: '19'
194+
run: uvx nox -s test -- --profile ci
195+
196+
- name: Install clang v20
197+
if: runner.os == 'Linux'
198+
uses: ./.github/install-clang-action
199+
with:
200+
version: '20'
201+
202+
- name: Collect Coverage for clang v20
203+
if: runner.os == 'Linux'
204+
env:
205+
CLANG_VERSION: '20'
206+
run: uvx nox -s test -- --profile ci
207+
208+
- name: Install clang v21
209+
if: runner.os == 'Linux'
210+
uses: ./.github/install-clang-action
211+
with:
212+
version: '21'
213+
214+
- name: Collect Coverage for clang v21
215+
if: runner.os == 'Linux'
216+
env:
217+
CLANG_VERSION: '21'
197218
run: uvx nox -s test -- --profile all
198219

199220
- name: Generate Coverage HTML report
200-
run: uvx nox -s pretty-cov
221+
run: uvx nox -s llvm-cov
201222

202223
- name: Upload coverage data
203224
uses: actions/upload-artifact@v4
204225
with:
205226
name: HTML_report-${{ runner.os }}
206-
path: target/llvm-cov-pretty
227+
path: target/llvm-cov/html
207228

208229
- name: Generate Coverage lcov report
209-
run: |
210-
rm coverage.json
211-
uvx nox -s lcov
230+
run: uvx nox -s lcov
212231

213232
- uses: codecov/codecov-action@v5
214233
with:

Cargo.lock

Lines changed: 23 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/python/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ crate-type = ["cdylib"]
1717
bench = false
1818

1919
[dependencies]
20-
pyo3 = { version = "0.25.1", features = ["extension-module"] }
20+
pyo3 = { version = "0.26.0", features = ["extension-module"] }
2121
cpp-linter = { path = "../../cpp-linter" }
2222
tokio = "1.47.1"
2323

cpp-linter/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ license.workspace = true
1616
[dependencies]
1717
anyhow = "1.0.99"
1818
chrono = "0.4.41"
19-
clap = "4.5.45"
19+
clap = "4.5.46"
2020
colored = "3.0.0"
21-
fast-glob = "0.4.5"
21+
fast-glob = "1.0.0"
2222
futures = "0.3.31"
2323
git2 = "0.20.2"
2424
lenient_semver = "0.4.2"
2525
log = { version = "0.4.27", features = ["std"] }
2626
openssl = { version = "0.10", features = ["vendored"], optional = true }
2727
openssl-probe = { version = "0.1", optional = true }
28-
quick-xml = {version = "0.38.1", features = ["serialize"]}
29-
regex = "1.11.1"
28+
quick-xml = {version = "0.38.3", features = ["serialize"]}
29+
regex = "1.11.2"
3030
reqwest = "0.12.23"
3131
semver = "1.0.26"
3232
serde = { version = "1.0.219", features = ["derive"] }
@@ -39,7 +39,7 @@ which = "8.0.0"
3939
[dev-dependencies]
4040
criterion = { version = "3.0.5", package = "codspeed-criterion-compat", features=["async_tokio"] }
4141
mockito = "1.7.0"
42-
tempfile = "3.20.0"
42+
tempfile = "3.21.0"
4343

4444
[features]
4545
openssl-vendored = ["dep:openssl", "dep:openssl-probe"]

cpp-linter/src/clang_tools/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ pub fn get_clang_tool_exe(name: &str, version: &str) -> Result<PathBuf> {
6565
// On Unix systems, this block is not likely reached. Typically, installing clang
6666
// will produce a symlink to the executable with the major version appended to the
6767
// name.
68-
return Ok(cmd);
68+
Ok(cmd)
6969
} else {
70-
return Err(anyhow!("Could not find clang tool by name and version"));
70+
Err(anyhow!("Could not find clang tool by name and version"))
7171
}
7272
} else {
7373
// `version` specified is not a semantic version; treat as path/to/bin

cpp-linter/src/git.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fn get_sha(repo: &Repository, depth: Option<u32>) -> Result<git2::Object<'_>, Er
4949
/// If there are files staged for a commit, then the resulting [`Diff`] will describe
5050
/// the staged changes. However, if there are no staged changes, then the last commit's
5151
/// [`Diff`] is returned.
52-
pub fn get_diff(repo: &Repository) -> Result<git2::Diff> {
52+
pub fn get_diff(repo: &'_ Repository) -> Result<git2::Diff<'_>> {
5353
let head = get_sha(repo, None).unwrap().peel_to_tree().unwrap();
5454
let mut has_staged_files = false;
5555
for entry in repo.statuses(None).unwrap().iter() {

docs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license.workspace = true
1010

1111
[dependencies]
1212
cpp-linter = { path = "../cpp-linter" }
13-
pyo3 = "0.25.1"
13+
pyo3 = "0.26.0"
1414

1515
[lib]
1616
name = "cli_gen"

0 commit comments

Comments
 (0)