Skip to content

Commit b6b1e48

Browse files
authored
Fix merge queue required status. (#4061)
Due to limitations of GitHub's merge queues we can't set the different "required workflows" for pull requests and merge queue. There are four jobs we want to run on merge queue only but also require them to pass before merging: - docker compose - Lint check all features - Long Faucet chain test - Run README tests So now we add these to all commits but skip if the current CI run is NOT merge queue. Now we can add them as required to pass for github settings.
1 parent 1718c58 commit b6b1e48

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

.github/workflows/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Docker Compose
33
on:
44
push:
55
branches: [ 'devnet_*', 'testnet_*' ]
6+
pull_request:
67
merge_group:
78
workflow_dispatch:
89

@@ -28,6 +29,7 @@ permissions:
2829

2930
jobs:
3031
compose:
32+
if: ${{ github.event_name == 'merge_group' }}
3133
runs-on: ubuntu-latest-16-cores
3234
timeout-minutes: 40
3335

.github/workflows/lint-check-all-features.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Lint check all features
33
on:
44
push:
55
branches: [ 'devnet_*', 'testnet_*' ]
6+
pull_request:
67
merge_group:
78
workflow_dispatch:
89

@@ -28,6 +29,7 @@ permissions:
2829

2930
jobs:
3031
lint-check-all-features:
32+
if: ${{ github.event_name == 'merge_group' }}
3133
runs-on: ubuntu-latest-16-cores
3234
timeout-minutes: 40
3335

.github/workflows/long_faucet_chain_test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Long Faucet chain test
33
on:
44
push:
55
branches: [ 'devnet_*', 'testnet_*' ]
6+
pull_request:
67
merge_group:
78
workflow_dispatch:
89

@@ -16,6 +17,7 @@ env:
1617

1718
jobs:
1819
long-faucet-chain-test:
20+
if: ${{ github.event_name == 'merge_group' }}
1921
runs-on: ubuntu-latest-16-cores
2022
timeout-minutes: 40
2123

.github/workflows/test-readmes.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Run README tests
33
on:
44
push:
55
branches: [ 'devnet_*', 'testnet_*' ]
6+
pull_request:
67
merge_group:
78
workflow_dispatch:
89

@@ -34,6 +35,7 @@ permissions:
3435

3536
jobs:
3637
test-readme-scripts:
38+
if: ${{ github.event_name == 'merge_group' }}
3739
runs-on: ubuntu-latest-16-cores
3840
timeout-minutes: 40
3941
steps:

0 commit comments

Comments
 (0)