Skip to content

Commit 3ab022e

Browse files
committed
Run CI checks for Rust 2024 as well
1 parent d49501c commit 3ab022e

File tree

1 file changed

+50
-2
lines changed

1 file changed

+50
-2
lines changed

Diff for: .github/workflows/clippy_pr.yml

+50-2
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,58 @@ jobs:
5757
env:
5858
OS: ${{ runner.os }}
5959

60-
# We need to have the "conclusion" job also on PR CI, to make it possible
60+
base-2024:
61+
runs-on: ubuntu-latest
62+
63+
steps:
64+
# Setup
65+
- name: Checkout
66+
uses: actions/checkout@v4
67+
68+
- name: Select Rust 2024 edition
69+
run: |
70+
for i in clippy_config clippy_dev clippy_lints clippy_utils lintcheck; do
71+
sed -i \
72+
-e '1icargo-features = ["edition2024"]' \
73+
-e 's/edition = "2021"/edition = "2024"/' \
74+
$i/Cargo.toml
75+
done
76+
77+
- name: Install toolchain
78+
run: rustup show active-toolchain
79+
80+
# Run
81+
- name: Build
82+
run: cargo build --tests --features internal
83+
84+
- name: Test
85+
run: cargo test --features internal
86+
87+
- name: Test clippy_lints
88+
run: cargo test --features internal
89+
working-directory: clippy_lints
90+
91+
- name: Test clippy_utils
92+
run: cargo test
93+
working-directory: clippy_utils
94+
95+
- name: Test rustc_tools_util
96+
run: cargo test
97+
working-directory: rustc_tools_util
98+
99+
- name: Test clippy_dev
100+
run: cargo test
101+
working-directory: clippy_dev
102+
103+
- name: Test clippy-driver
104+
run: .github/driver.sh
105+
env:
106+
OS: ${{ runner.os }}
107+
108+
# We need to have the "conclusion" job also on PR CI, to make it possible
61109
# to add PRs to a merge queue.
62110
conclusion:
63-
needs: [ base ]
111+
needs: [ base, base-2024 ]
64112
# We need to ensure this job does *not* get skipped if its dependencies fail,
65113
# because a skipped job is considered a success by GitHub. So we have to
66114
# overwrite `if:`. We use `!cancelled()` to ensure the job does still not get run

0 commit comments

Comments
 (0)