Skip to content

Commit aa2a8f9

Browse files
committed
Use merge groups
1 parent 640c3d6 commit aa2a8f9

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: CI
22

3-
on: [ push, pull_request ]
3+
on:
4+
pull_request:
5+
merge_group:
46

57
jobs:
68
ci:
@@ -61,24 +63,23 @@ jobs:
6163
run: touch build/.nojekyll
6264

6365
- name: Upload GitHub pages artifact
64-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
6566
uses: actions/upload-pages-artifact@v3
6667
with:
6768
path: build
6869

6970
- name: Deploy to GitHub Pages
70-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
71+
if: github.event_name == 'merge_group'
7172
uses: actions/deploy-pages@v4
7273

7374
- name: Configure AWS credentials
74-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
75+
if: github.event_name == 'merge_group'
7576
uses: aws-actions/configure-aws-credentials@v1
7677
with:
7778
role-to-assume: arn:aws:iam::890664054962:role/ci--rust-lang--team
7879
aws-region: us-west-1
7980

8081
- name: Start the synchronization tool
81-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
82+
if: github.event_name == 'merge_group'
8283
run: |
8384
# Introduce some artificial delay to help github pages propagate.
8485
sleep 60

0 commit comments

Comments
 (0)