Skip to content

Commit 3a63dc4

Browse files
committed
Merge branch 'unstable' of https://github.com/sigp/lighthouse into runtime-rpc-request-sizes
2 parents 3326584 + 01994c4 commit 3a63dc4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1773
-626
lines changed

.github/mergify.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
queue_rules:
2+
- name: default
3+
batch_size: 8
4+
batch_max_wait_time: 60 s
5+
checks_timeout: 10800 s
6+
merge_method: squash
7+
queue_conditions:
8+
- "#approved-reviews-by >= 1"
9+
- "check-success=license/cla"
10+
- "check-success=target-branch-check"
11+
merge_conditions:
12+
- "check-success=test-suite-success"
13+
- "check-success=local-testnet-success"

.github/workflows/local-testnet.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,15 @@ jobs:
8686

8787
- name: Stop local testnet with blinded block production
8888
run: ./stop_local_testnet.sh
89-
working-directory: scripts/local_testnet
89+
working-directory: scripts/local_testnet
90+
91+
# This job succeeds ONLY IF all others succeed. It is used by the merge queue to determine whether
92+
# a PR is safe to merge. New jobs should be added here.
93+
local-testnet-success:
94+
name: local-testnet-success
95+
runs-on: ubuntu-latest
96+
needs: ["run-local-testnet"]
97+
steps:
98+
- uses: actions/checkout@v3
99+
- name: Check that success job is dependent on all others
100+
run: ./scripts/ci/check-success-job.sh ./.github/workflows/local-testnet.yml local-testnet-success

.github/workflows/test-suite.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,3 +423,36 @@ jobs:
423423
cache-target: release
424424
- name: Run Makefile to trigger the bash script
425425
run: make cli
426+
# This job succeeds ONLY IF all others succeed. It is used by the merge queue to determine whether
427+
# a PR is safe to merge. New jobs should be added here.
428+
test-suite-success:
429+
name: test-suite-success
430+
runs-on: ubuntu-latest
431+
needs: [
432+
'target-branch-check',
433+
'release-tests-ubuntu',
434+
'release-tests-windows',
435+
'beacon-chain-tests',
436+
'op-pool-tests',
437+
'network-tests',
438+
'slasher-tests',
439+
'debug-tests-ubuntu',
440+
'state-transition-vectors-ubuntu',
441+
'ef-tests-ubuntu',
442+
'dockerfile-ubuntu',
443+
'eth1-simulator-ubuntu',
444+
'merge-transition-ubuntu',
445+
'no-eth1-simulator-ubuntu',
446+
'syncing-simulator-ubuntu',
447+
'doppelganger-protection-test',
448+
'execution-engine-integration-ubuntu',
449+
'check-code',
450+
'check-msrv',
451+
'cargo-udeps',
452+
'compile-with-beta-compiler',
453+
'cli-check',
454+
]
455+
steps:
456+
- uses: actions/checkout@v3
457+
- name: Check that success job is dependent on all others
458+
run: ./scripts/ci/check-success-job.sh ./.github/workflows/test-suite.yml test-suite-success

0 commit comments

Comments
 (0)