Prepare CI for merge queues (#4252)

* Prepare CI for merge queues

* Fix syntax SNAFUs
This commit is contained in:
Michael Sproul 2023-05-02 11:59:51 +10:00 committed by GitHub
parent f1c64d119a
commit 826e748629
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 7 deletions

View File

@ -5,7 +5,6 @@ on:
branches:
- unstable
- stable
- capella
tags:
- v*
@ -35,11 +34,6 @@ jobs:
run: |
echo "VERSION=latest" >> $GITHUB_ENV
echo "VERSION_SUFFIX=-unstable" >> $GITHUB_ENV
- name: Extract version (if capella)
if: github.event.ref == 'refs/heads/capella'
run: |
echo "VERSION=capella" >> $GITHUB_ENV
echo "VERSION_SUFFIX=" >> $GITHUB_ENV
- name: Extract version (if tagged release)
if: startsWith(github.event.ref, 'refs/tags')
run: |

View File

@ -7,6 +7,7 @@ on:
pull_request:
paths:
- 'book/**'
merge_group:
jobs:
linkcheck:

View File

@ -6,6 +6,7 @@ on:
branches:
- unstable
pull_request:
merge_group:
jobs:
run-local-testnet:

View File

@ -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)
@ -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"