Skip to content

Commit aefad2b

Browse files
committed
Make component removal best-effort and preserve single-error behavior
1 parent 5100b80 commit aefad2b

File tree

13 files changed

+371
-175
lines changed

13 files changed

+371
-175
lines changed

.github/workflows/ci.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
- main
1414
- release/*
1515
- stable
16-
workflow_dispatch:
1716
schedule:
1817
- cron: "30 0 * * 1,3,5" # At 00:30 UTC on Monday, Wednesday, and Friday
1918

@@ -23,7 +22,7 @@ jobs:
2322
# Do not edit this file in .github/workflows
2423
build-windows-pr: # job-name skip-main skip-stable
2524
runs-on: ${{ matrix.os || 'windows-latest' }}
26-
if: ${{ contains(fromJSON('["pull_request", "merge_group"]'), github.event_name) }} # skip-main skip-stable
25+
if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-main skip-stable
2726
env:
2827
RUSTFLAGS: -Ctarget-feature=+crt-static
2928
RUST_MIN_STACK: 16777216
@@ -367,7 +366,7 @@ jobs:
367366
# Do not edit this file in .github/workflows
368367
build-windows-stable: # job-name skip-main skip-pr
369368
runs-on: ${{ matrix.os || 'windows-latest' }}
370-
if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || contains(fromJSON('["schedule", "workflow_dispatch"]'), github.event_name) }} # skip-pr skip-main
369+
if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || github.event_name == 'schedule' }} # skip-pr skip-main
371370
env:
372371
RUSTFLAGS: -Ctarget-feature=+crt-static
373372
RUST_MIN_STACK: 16777216
@@ -545,7 +544,7 @@ jobs:
545544
# Do not edit this file in .github/workflows
546545
build-linux-pr: # job-name skip-main skip-stable
547546
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
548-
if: ${{ contains(fromJSON('["pull_request", "merge_group"]'), github.event_name) }} # skip-main skip-stable
547+
if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }} # skip-main skip-stable
549548
permissions:
550549
id-token: write
551550
contents: read
@@ -887,7 +886,7 @@ jobs:
887886
# Do not edit this file in .github/workflows
888887
build-linux-stable: # job-name skip-main skip-pr
889888
runs-on: ${{ matrix.os || 'ubuntu-latest' }}
890-
if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || contains(fromJSON('["schedule", "workflow_dispatch"]'), github.event_name) }} # skip-pr skip-main
889+
if: ${{ github.event_name == 'push' && github.ref_name == 'stable' || github.event_name == 'schedule' }} # skip-pr skip-main
891890
permissions:
892891
id-token: write
893892
contents: read
@@ -1347,7 +1346,7 @@ jobs:
13471346
# Do not edit this file in .github/workflows
13481347
build-freebsd-main: # job-name skip-stable
13491348
runs-on: ubuntu-latest
1350-
if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || startsWith(github.ref_name, 'release/'))) || contains(fromJSON('["schedule", "workflow_dispatch"]'), github.event_name) }} # skip-stable
1349+
if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || startsWith(github.ref_name, 'release/'))) || github.event_name == 'schedule' }} # skip-stable
13511350
steps:
13521351
- uses: actions/checkout@v6
13531352
with:
@@ -1499,7 +1498,7 @@ jobs:
14991498
# templating and so on.
15001499
build-all-features: # job-name
15011500
runs-on: ${{ matrix.os }}
1502-
if: ${{ contains(fromJSON('["pull_request", "merge_group"]'), github.event_name) }}
1501+
if: ${{ contains('["pull_request", "merge_group"]', github.event_name) }}
15031502
strategy:
15041503
fail-fast: false
15051504
matrix:
@@ -1565,7 +1564,7 @@ jobs:
15651564
with:
15661565
tool: mdbook@${{ env.MDBOOK_VERSION }}
15671566
- name: Build user-guide (stable)
1568-
if: ${{ !contains(fromJSON('["pull_request", "merge_group"]'), github.event_name) }}
1567+
if: ${{ !contains('["pull_request", "merge_group"]', github.event_name) }}
15691568
run: |
15701569
git checkout stable
15711570
# Support both old and new directory structure during the transition
@@ -1587,7 +1586,7 @@ jobs:
15871586
mkdir -p ${{ runner.temp }}/book
15881587
mv book ${{ runner.temp }}/book/dev-guide
15891588
- name: Deploy to GitHub
1590-
if: ${{ !contains(fromJSON('["pull_request", "merge_group"]'), github.event_name) && !startsWith(github.ref_name, 'release/') }}
1589+
if: ${{ !contains('["pull_request", "merge_group"]', github.event_name) && !startsWith(github.ref_name, 'release/') }}
15911590
run: |
15921591
cd ${{ runner.temp }}/book
15931592
git config --global init.defaultBranch main

0 commit comments

Comments
 (0)