Skip to content

Commit 728b15e

Browse files
committed
fix ci
1 parent 5843370 commit 728b15e

File tree

1 file changed

+5
-67
lines changed

1 file changed

+5
-67
lines changed

.github/workflows/main.yaml

Lines changed: 5 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -239,68 +239,6 @@ jobs:
239239
rustup component add rustfmt
240240
- run: cargo fmt -- --check
241241

242-
# Determine which extensive tests should be run based on changed files.
243-
calculate_extensive_matrix:
244-
name: Calculate job matrix
245-
runs-on: ubuntu-24.04
246-
outputs:
247-
matrix: ${{ steps.script.outputs.matrix }}
248-
steps:
249-
- uses: actions/checkout@v4
250-
with:
251-
fetch-depth: 100
252-
- name: Fetch pull request ref
253-
run: git fetch origin "$GITHUB_REF:$GITHUB_REF"
254-
if: github.event_name == 'pull_request'
255-
- run: python3 ci/calculate-exhaustive-matrix.py >> "$GITHUB_OUTPUT"
256-
id: script
257-
258-
extensive:
259-
name: Extensive tests for ${{ matrix.ty }}
260-
needs:
261-
# Wait on `clippy` so we have some confidence that the crate will build
262-
- clippy
263-
- calculate_extensive_matrix
264-
runs-on: ubuntu-24.04
265-
timeout-minutes: 80
266-
strategy:
267-
matrix:
268-
# Use the output from `calculate_extensive_matrix` to calculate the matrix
269-
# FIXME: it would be better to run all jobs (i.e. all types) but mark those that
270-
# didn't change as skipped, rather than completely excluding the job. However,
271-
# this is not currently possible https://github.com/actions/runner/issues/1985.
272-
include: ${{ fromJSON(needs.calculate_extensive_matrix.outputs.matrix).matrix }}
273-
env:
274-
CHANGED: ${{ matrix.changed }}
275-
steps:
276-
- uses: actions/checkout@v4
277-
- name: Install Rust
278-
run: |
279-
rustup update nightly --no-self-update
280-
rustup default nightly
281-
- uses: Swatinem/rust-cache@v2
282-
- name: Download musl source
283-
run: ./ci/download-musl.sh
284-
- name: Run extensive tests
285-
run: |
286-
echo "Changed: '$CHANGED'"
287-
if [ -z "$CHANGED" ]; then
288-
echo "No tests to run, exiting."
289-
exit
290-
fi
291-
292-
rustfmt:
293-
name: Rustfmt
294-
runs-on: ubuntu-24.04
295-
steps:
296-
- uses: actions/checkout@master
297-
- name: Install Rust
298-
run: |
299-
rustup update nightly --no-self-update
300-
rustup default nightly
301-
rustup component add rustfmt
302-
- run: cargo fmt -- --check
303-
304242
# Determine which extensive tests should be run based on changed files.
305243
calculate_extensive_matrix:
306244
name: Calculate job matrix
@@ -361,12 +299,12 @@ jobs:
361299

362300
success:
363301
needs:
364-
# - test
365-
# - builtins
302+
- test
303+
- builtins
366304
- benchmarks
367-
# - msrv
368-
# - rustfmt
369-
# - extensive
305+
- msrv
306+
- rustfmt
307+
- extensive
370308
runs-on: ubuntu-24.04
371309
# GitHub branch protection is exceedingly silly and treats "jobs skipped because a dependency
372310
# failed" as success. So we have to do some contortions to ensure the job fails if any of its

0 commit comments

Comments
 (0)