Skip to content

Commit 81f5859

Browse files
committed
Merge remote-tracking branch 'origin/unstable' into skip-kzg-checks-on-el-blobs-2
# Conflicts: # beacon_node/beacon_chain/src/fetch_blobs/fetch_blobs_beacon_adapter.rs # beacon_node/beacon_chain/src/metrics.rs
2 parents 267a3d3 + b48879a commit 81f5859

File tree

76 files changed

+2904
-1414
lines changed

Some content is hidden

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

76 files changed

+2904
-1414
lines changed

.github/mergify.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
pull_request_rules:
22
- name: Ask to resolve conflict
33
conditions:
4+
- -closed
45
- conflict
56
- -author=dependabot[bot]
7+
- label=ready-for-review
68
- or:
79
- -draft # Don't report conflicts on regular draft.
810
- and: # Do report conflicts on draft that are scheduled for the next major release.
@@ -12,6 +14,64 @@ pull_request_rules:
1214
comment:
1315
message: This pull request has merge conflicts. Could you please resolve them
1416
@{{author}}? 🙏
17+
label:
18+
add:
19+
- waiting-on-author
20+
remove:
21+
- ready-for-review
22+
23+
- name: Ask to resolve CI failures
24+
conditions:
25+
- -closed
26+
- label=ready-for-review
27+
- or:
28+
- check-skipped=test-suite-success
29+
- check-skipped=local-testnet-success
30+
- check-failure=test-suite-success
31+
- check-failure=local-testnet-success
32+
actions:
33+
comment:
34+
message: Some required checks have failed. Could you please take a look @{{author}}? 🙏
35+
label:
36+
add:
37+
- waiting-on-author
38+
remove:
39+
- ready-for-review
40+
41+
- name: Update labels when PR is unblocked
42+
conditions:
43+
- -closed
44+
- -draft
45+
- label=waiting-on-author
46+
- -conflict
47+
# Unfortunately, it doesn't look like there's an easy way to check for PRs pending
48+
# CI workflows approvals.
49+
- check-success=test-suite-success
50+
- check-success=local-testnet-success
51+
# Update the label only if there are no more change requests from any reviewers and no unresolved threads.
52+
# This rule ensures that a PR with passing CI can be marked as `waiting-on-author`.
53+
- "#changes-requested-reviews-by = 0"
54+
- "#review-threads-unresolved = 0"
55+
actions:
56+
label:
57+
remove:
58+
- waiting-on-author
59+
add:
60+
- ready-for-review
61+
62+
- name: Close stale pull request after 30 days of inactivity
63+
conditions:
64+
- -closed
65+
- label=waiting-on-author
66+
- updated-at<=30 days ago
67+
actions:
68+
close:
69+
message: >
70+
Hi @{{author}}, this pull request has been closed automatically due to 30 days of inactivity.
71+
If you’d like to continue working on it, feel free to reopen at any time.
72+
label:
73+
add:
74+
- stale
1575

1676
- name: Approve trivial maintainer PRs
1777
conditions:

.github/workflows/test-suite.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,28 @@ jobs:
159159
- name: Show cache stats
160160
if: env.SELF_HOSTED_RUNNERS == 'true'
161161
run: sccache --show-stats
162+
http-api-tests:
163+
name: http-api-tests
164+
needs: [check-labels]
165+
if: needs.check-labels.outputs.skip_ci != 'true'
166+
# Use self-hosted runners only on the sigp repo.
167+
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
168+
env:
169+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
170+
steps:
171+
- uses: actions/checkout@v4
172+
- name: Get latest version of stable Rust
173+
if: env.SELF_HOSTED_RUNNERS == 'false'
174+
uses: moonrepo/setup-rust@v1
175+
with:
176+
channel: stable
177+
cache-target: release
178+
bins: cargo-nextest
179+
- name: Run http_api tests for all recent forks
180+
run: make test-http-api
181+
- name: Show cache stats
182+
if: env.SELF_HOSTED_RUNNERS == 'true'
183+
run: sccache --show-stats
162184
op-pool-tests:
163185
name: op-pool-tests
164186
needs: [check-labels]
@@ -475,6 +497,7 @@ jobs:
475497
'op-pool-tests',
476498
'network-tests',
477499
'slasher-tests',
500+
'http-api-tests',
478501
'debug-tests-ubuntu',
479502
'state-transition-vectors-ubuntu',
480503
'ef-tests-ubuntu',

0 commit comments

Comments
 (0)