Skip to content

Commit

Permalink
Prepare CI for merge queues (sigp#4252)
Browse files Browse the repository at this point in the history
* Prepare CI for merge queues

* Fix syntax SNAFUs
  • Loading branch information
michaelsproul authored and Woodpile37 committed Jan 6, 2024
1 parent f833582 commit 3d77b4e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/linkcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
pull_request:
paths:
- 'book/**'
merge_group:

jobs:
linkcheck:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/local-testnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- unstable
pull_request:
merge_group:

jobs:
run-local-testnet:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- trying
- 'pr/*'
pull_request:
merge_group:
env:
# Deny warnings in CI
# Disable debug info (see https://github.com/sigp/lighthouse/issues/4005)
Expand All @@ -20,7 +21,7 @@ jobs:
target-branch-check:
name: target-branch-check
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
steps:
- name: Check that the pull request is not targeting the stable branch
run: test ${{ github.base_ref }} != "stable"
Expand Down

0 comments on commit 3d77b4e

Please sign in to comment.