Skip to content

Commit e8878f4

Browse files
committed
Consolidate CI test and build workflows
1 parent c2502d0 commit e8878f4

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

.github/workflows/ci.yml

+2-14
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,6 @@ jobs:
1717
uses: dtolnay/.github/.github/workflows/pre_ci.yml@master
1818

1919
test:
20-
name: Test
21-
needs: pre_ci
22-
if: needs.pre_ci.outputs.continue
23-
runs-on: ubuntu-latest
24-
timeout-minutes: 45
25-
steps:
26-
- uses: actions/checkout@v4
27-
- uses: dtolnay/rust-toolchain@nightly
28-
- name: Enable type layout randomization
29-
run: echo RUSTFLAGS=${RUSTFLAGS}\ -Zrandomize-layout >> $GITHUB_ENV
30-
- run: cargo run -- expand --manifest-path tests/Cargo.toml > expand.rs
31-
- run: diff tests/lib.expand.rs expand.rs
32-
33-
build:
3420
name: ${{matrix.name || format('Rust {0}', matrix.rust)}}
3521
needs: pre_ci
3622
if: needs.pre_ci.outputs.continue
@@ -66,6 +52,8 @@ jobs:
6652
env:
6753
RUSTFLAGS: ${{env.RUSTFLAGS}} ${{matrix.rust == 'nightly' && '--cfg exhaustive' || ''}}
6854
if: matrix.os == 'ubuntu' && matrix.rust == 'nightly'
55+
- run: cargo run -- expand --manifest-path tests/Cargo.toml > expand.rs && diff tests/lib.expand.rs expand.rs
56+
if: startsWith(matrix.rust, 'nightly')
6957

7058
clippy:
7159
name: Clippy

0 commit comments

Comments
 (0)