Skip to content

Commit 5a3a2e3

Browse files
committed
chore: Do correct testing
It was intended to run tests with the MSRV and not the clippy. Since clippy format changes between releases it is not correct to check if the code formatted with newer clippy passed old clippy. It is relevant for tests though.
1 parent 156e868 commit 5a3a2e3

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ updates:
1010
directory: "/"
1111
schedule:
1212
interval: "weekly"
13-
13+
1414
- package-ecosystem: "cargo"
1515
directory: "/"
1616
schedule:

.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ jobs:
2929
include:
3030
- target: x86_64-unknown-linux-gnu
3131
os: ubuntu-latest
32+
test_args: "-p openstack_sdk -p openstack_types"
33+
rust_ver: 1.76
34+
- target: x86_64-unknown-linux-gnu
35+
os: ubuntu-latest
36+
test_args: "-p openstack_cli -p openstack_tui"
37+
rust_ver: 1.85
3238
# - target: x86_64-unknown-linux-musl
3339
# os: ubuntu-latest
3440
# - target: x86_64-apple-darwin
@@ -48,8 +54,8 @@ jobs:
4854
- name: Install Rust
4955
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
5056
with:
51-
toolchain: stable
5257
targets: ${{ matrix.target }}
58+
toolchain: ${{ matrix.rust_ver }}
5359

5460
- name: Install cargo-nextest
5561
uses: taiki-e/install-action@f1390fd0d8205ae79e5e57b1d1e300dceeb4163e # v2.49.44
@@ -60,7 +66,7 @@ jobs:
6066
uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
6167

6268
- name: Run tests
63-
run: cargo nextest run
69+
run: cargo nextest run ${{ matrix.test_args }}
6470

6571
- name: Run Doc tests
6672
run: cargo test --doc

.github/workflows/linters.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,6 @@ jobs:
5555
permissions:
5656
contents: read
5757
security-events: write
58-
strategy:
59-
matrix:
60-
include:
61-
- rust_ver: 1.76
62-
clippy_args: "-p openstack_sdk -p openstack_types"
63-
- rust_ver: 1.85
64-
clippy_args: "-p openstack_cli -p openstack_tui"
6558
steps:
6659

6760
- name: Harden Runner
@@ -71,10 +64,10 @@ jobs:
7164

7265
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7366

74-
- name: Install Rust ${{ matrix.rust_ver }}
67+
- name: Install Rust
7568
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable
7669
with:
77-
toolchain: ${{ matrix.rust_ver }}
70+
toolchain: stable
7871
components: rustfmt, clippy
7972

8073
- uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
@@ -91,7 +84,7 @@ jobs:
9184
run:
9285
cargo clippy
9386
--lib --tests
94-
--all-features ${{ matrix.clippy_args }}
87+
--all-features
9588
--message-format=json | ${CARGO_HOME}/bin/clippy-sarif | tee rust-clippy-results.sarif | ${CARGO_HOME}/bin/sarif-fmt
9689

9790
- name: Upload analysis results to GitHub

doc/book.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ src = "src"
66
title = "OpenStack Client Tools"
77

88
[rust]
9-
edition = "2024"
9+
edition = "2024"
1010

1111
[build]
1212
build-dir = "html"

0 commit comments

Comments
 (0)