Skip to content

Commit 1053e42

Browse files
committed
prepare for merge queue
1 parent c5c36fa commit 1053e42

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
name: CI
22

33
on:
4-
push:
5-
branches:
6-
- 'master'
74
pull_request:
8-
branches:
9-
- 'master'
5+
merge_group:
6+
push:
7+
branches: ['master']
108
schedule:
119
- cron: '00 2 * * *' # At 02:00 UTC every day (like rustup-components-history).
1210

@@ -56,12 +54,22 @@ jobs:
5654
- name: Test
5755
run: bash ./ci-test.sh stdarch
5856

57+
# One job that "summarizes" the success state of this pipeline. This can then be added to branch
58+
# protection, rather than having to add each job separately.
59+
success:
60+
name: Success
61+
runs-on: ubuntu-latest
62+
needs: [test-core, test-alloc, test-std, test-simd, test-stdarch]
63+
steps:
64+
- name: mark the job as a success
65+
run: exit 0
66+
5967
# Send a Zulip notification when a cron job fails
6068
cron-fail-notify:
6169
name: cronjob failure notification
6270
runs-on: ubuntu-latest
63-
needs: [test-core, test-alloc, test-std, test-simd]
64-
if: github.event_name == 'schedule' && (failure() || cancelled())
71+
needs: [success]
72+
if: github.event_name == 'schedule' && failure()
6573
steps:
6674
- name: Install zulip-send
6775
run: pip3 install zulip

0 commit comments

Comments
 (0)