Skip to content

Commit 826e748

Browse files
Prepare CI for merge queues (#4252)
* Prepare CI for merge queues * Fix syntax SNAFUs
1 parent f1c64d1 commit 826e748

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

.github/workflows/docker.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- unstable
77
- stable
8-
- capella
98
tags:
109
- v*
1110

@@ -35,11 +34,6 @@ jobs:
3534
run: |
3635
echo "VERSION=latest" >> $GITHUB_ENV
3736
echo "VERSION_SUFFIX=-unstable" >> $GITHUB_ENV
38-
- name: Extract version (if capella)
39-
if: github.event.ref == 'refs/heads/capella'
40-
run: |
41-
echo "VERSION=capella" >> $GITHUB_ENV
42-
echo "VERSION_SUFFIX=" >> $GITHUB_ENV
4337
- name: Extract version (if tagged release)
4438
if: startsWith(github.event.ref, 'refs/tags')
4539
run: |

.github/workflows/linkcheck.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
pull_request:
88
paths:
99
- 'book/**'
10+
merge_group:
1011

1112
jobs:
1213
linkcheck:

.github/workflows/local-testnet.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches:
77
- unstable
88
pull_request:
9+
merge_group:
910

1011
jobs:
1112
run-local-testnet:

.github/workflows/test-suite.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- trying
99
- 'pr/*'
1010
pull_request:
11+
merge_group:
1112
env:
1213
# Deny warnings in CI
1314
# Disable debug info (see https://github.com/sigp/lighthouse/issues/4005)
@@ -20,7 +21,7 @@ jobs:
2021
target-branch-check:
2122
name: target-branch-check
2223
runs-on: ubuntu-latest
23-
if: github.event_name == 'pull_request'
24+
if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
2425
steps:
2526
- name: Check that the pull request is not targeting the stable branch
2627
run: test ${{ github.base_ref }} != "stable"

0 commit comments

Comments
 (0)