Prepare CI for merge queues (#4252)
* Prepare CI for merge queues * Fix syntax SNAFUs
This commit is contained in:
parent
f1c64d119a
commit
826e748629
6
.github/workflows/docker.yml
vendored
6
.github/workflows/docker.yml
vendored
@ -5,7 +5,6 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- unstable
|
- unstable
|
||||||
- stable
|
- stable
|
||||||
- capella
|
|
||||||
tags:
|
tags:
|
||||||
- v*
|
- v*
|
||||||
|
|
||||||
@ -35,11 +34,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "VERSION=latest" >> $GITHUB_ENV
|
echo "VERSION=latest" >> $GITHUB_ENV
|
||||||
echo "VERSION_SUFFIX=-unstable" >> $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)
|
- name: Extract version (if tagged release)
|
||||||
if: startsWith(github.event.ref, 'refs/tags')
|
if: startsWith(github.event.ref, 'refs/tags')
|
||||||
run: |
|
run: |
|
||||||
|
1
.github/workflows/linkcheck.yml
vendored
1
.github/workflows/linkcheck.yml
vendored
@ -7,6 +7,7 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- 'book/**'
|
- 'book/**'
|
||||||
|
merge_group:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
linkcheck:
|
linkcheck:
|
||||||
|
1
.github/workflows/local-testnet.yml
vendored
1
.github/workflows/local-testnet.yml
vendored
@ -6,6 +6,7 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- unstable
|
- unstable
|
||||||
pull_request:
|
pull_request:
|
||||||
|
merge_group:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
run-local-testnet:
|
run-local-testnet:
|
||||||
|
3
.github/workflows/test-suite.yml
vendored
3
.github/workflows/test-suite.yml
vendored
@ -8,6 +8,7 @@ on:
|
|||||||
- trying
|
- trying
|
||||||
- 'pr/*'
|
- 'pr/*'
|
||||||
pull_request:
|
pull_request:
|
||||||
|
merge_group:
|
||||||
env:
|
env:
|
||||||
# Deny warnings in CI
|
# Deny warnings in CI
|
||||||
# Disable debug info (see https://github.com/sigp/lighthouse/issues/4005)
|
# Disable debug info (see https://github.com/sigp/lighthouse/issues/4005)
|
||||||
@ -20,7 +21,7 @@ jobs:
|
|||||||
target-branch-check:
|
target-branch-check:
|
||||||
name: target-branch-check
|
name: target-branch-check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: github.event_name == 'pull_request'
|
if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
|
||||||
steps:
|
steps:
|
||||||
- name: Check that the pull request is not targeting the stable branch
|
- name: Check that the pull request is not targeting the stable branch
|
||||||
run: test ${{ github.base_ref }} != "stable"
|
run: test ${{ github.base_ref }} != "stable"
|
||||||
|
Loading…
Reference in New Issue
Block a user