Skip to content

Commit 660c433

Browse files
jxsjxs
committed
Merge branch 'stable' of github.com:sigp/lighthouse into improve-mergify
2 parents 599cf1d + 0d90135 commit 660c433

File tree

691 files changed

+54601
-24603
lines changed

Some content is hidden

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

691 files changed

+54601
-24603
lines changed

‎.cargo/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[env]
22
# Set the number of arenas to 16 when using jemalloc.
33
JEMALLOC_SYS_WITH_MALLOC_CONF = "abort_conf:true,narenas:16"
4-

‎.github/mergify.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ queue_rules:
4040
commit_message_template: |
4141
{{ title }} (#{{ number }})
4242
43-
{% for commit in commits %}
44-
* {{ commit.commit_message }}
45-
{% endfor %}
43+
{{ body | get_section("## Issue Addressed", "") }}
44+
45+
46+
{{ body | get_section("## Proposed Changes", "") }}
4647
queue_conditions:
4748
- "#approved-reviews-by >= 1"
4849
- "check-success=license/cla"

‎.github/workflows/docker.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
env:
16-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
17-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
16+
DOCKER_PASSWORD: ${{ secrets.DH_KEY }}
17+
DOCKER_USERNAME: ${{ secrets.DH_ORG }}
1818
# Enable self-hosted runners for the sigp repo only.
1919
SELF_HOSTED_RUNNERS: ${{ github.repository == 'sigp/lighthouse' }}
2020

@@ -80,7 +80,7 @@ jobs:
8080
- name: Set `make` command for lighthouse
8181
if: startsWith(matrix.binary, 'lighthouse')
8282
run: |
83-
echo "MAKE_CMD=build-${{ matrix.cpu_arch }}-portable" >> $GITHUB_ENV
83+
echo "MAKE_CMD=build-${{ matrix.cpu_arch }}" >> $GITHUB_ENV
8484
8585
- name: Set `make` command for lcli
8686
if: startsWith(matrix.binary, 'lcli')
@@ -124,9 +124,6 @@ jobs:
124124
push: true
125125
tags: |
126126
${{ github.repository_owner}}/${{ matrix.binary }}:${{ env.VERSION }}-${{ env.SHORT_ARCH }}${{ env.VERSION_SUFFIX }}
127-
${{ github.repository_owner}}/${{ matrix.binary }}:${{ env.VERSION }}-${{ env.SHORT_ARCH }}${{ env.VERSION_SUFFIX }}-dev
128-
${{ github.repository_owner}}/${{ matrix.binary }}:${{ env.VERSION }}-${{ env.SHORT_ARCH }}${{ env.VERSION_SUFFIX }}-modern
129-
${{ github.repository_owner}}/${{ matrix.binary }}:${{ env.VERSION }}-${{ env.SHORT_ARCH }}${{ env.VERSION_SUFFIX }}-modern-dev
130127
131128
- name: Build and push (lcli)
132129
if: startsWith(matrix.binary, 'lcli')

‎.github/workflows/local-testnet.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,11 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@v4
3838

39-
- name: Install dependencies
39+
- name: Install Kurtosis
4040
run: |
41-
sudo add-apt-repository ppa:rmescandon/yq
4241
echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
4342
sudo apt update
44-
sudo apt install -y kurtosis-cli yq
43+
sudo apt install -y kurtosis-cli
4544
kurtosis analytics disable
4645
4746
- name: Download Docker image artifact
@@ -83,12 +82,11 @@ jobs:
8382
steps:
8483
- uses: actions/checkout@v4
8584

86-
- name: Install dependencies
85+
- name: Install Kurtosis
8786
run: |
88-
sudo add-apt-repository ppa:rmescandon/yq
8987
echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
9088
sudo apt update
91-
sudo apt install -y kurtosis-cli yq
89+
sudo apt install -y kurtosis-cli
9290
kurtosis analytics disable
9391
9492
- name: Download Docker image artifact
@@ -119,12 +117,11 @@ jobs:
119117
steps:
120118
- uses: actions/checkout@v4
121119

122-
- name: Install dependencies
120+
- name: Install Kurtosis
123121
run: |
124-
sudo add-apt-repository ppa:rmescandon/yq
125122
echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
126123
sudo apt update
127-
sudo apt install -y kurtosis-cli yq
124+
sudo apt install -y kurtosis-cli
128125
kurtosis analytics disable
129126
130127
- name: Download Docker image artifact

‎.github/workflows/release.yml

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ concurrency:
1010
cancel-in-progress: true
1111

1212
env:
13-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
14-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
13+
DOCKER_PASSWORD: ${{ secrets.DH_KEY }}
14+
DOCKER_USERNAME: ${{ secrets.DH_ORG }}
1515
REPO_NAME: ${{ github.repository_owner }}/lighthouse
1616
IMAGE_NAME: ${{ github.repository_owner }}/lighthouse
1717
# Enable self-hosted runners for the sigp repo only.
@@ -78,13 +78,13 @@ jobs:
7878
if: matrix.arch == 'aarch64-unknown-linux-gnu'
7979
run: |
8080
cargo install cross
81-
env CROSS_PROFILE=${{ matrix.profile }} make build-aarch64-portable
81+
env CROSS_PROFILE=${{ matrix.profile }} make build-aarch64
8282
8383
- name: Build Lighthouse for x86_64-unknown-linux-gnu
8484
if: matrix.arch == 'x86_64-unknown-linux-gnu'
8585
run: |
8686
cargo install cross
87-
env CROSS_PROFILE=${{ matrix.profile }} make build-x86_64-portable
87+
env CROSS_PROFILE=${{ matrix.profile }} make build-x86_64
8888
8989
- name: Move cross-compiled binary
9090
if: contains(matrix.arch, 'unknown-linux-gnu')
@@ -113,7 +113,7 @@ jobs:
113113
echo "$GPG_PASSPHRASE" | gpg --passphrase-fd 0 --pinentry-mode loopback --batch -ab lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz
114114
for ext in "tar.gz" "tar.gz.asc";\
115115
do for f in *.$ext;\
116-
do cp $f "../${f%.$ext}-portable.$ext";\
116+
do cp $f "../${f%.$ext}.$ext";\
117117
done;\
118118
done
119119
mv *tar.gz* ..
@@ -144,29 +144,13 @@ jobs:
144144
path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz
145145
compression-level: 0
146146

147-
- name: Upload artifact (copy)
148-
if: startsWith(matrix.arch, 'x86_64-windows') != true
149-
uses: actions/upload-artifact@v4
150-
with:
151-
name: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz
152-
path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz
153-
compression-level: 0
154-
155147
- name: Upload signature
156148
uses: actions/upload-artifact@v4
157149
with:
158150
name: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz.asc
159151
path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz.asc
160152
compression-level: 0
161153

162-
- name: Upload signature (copy)
163-
if: startsWith(matrix.arch, 'x86_64-windows') != true
164-
uses: actions/upload-artifact@v4
165-
with:
166-
name: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz.asc
167-
path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz.asc
168-
compression-level: 0
169-
170154
draft-release:
171155
name: Draft Release
172156
needs: [build, extract-version]
@@ -253,13 +237,9 @@ jobs:
253237
| System | Architecture | Binary | PGP Signature |
254238
|:---:|:---:|:---:|:---|
255239
| <img src="https://simpleicons.org/icons/apple.svg" style="width: 32px;"/> | x86_64 | [lighthouse-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz.asc) |
256-
| <img src="https://simpleicons.org/icons/apple.svg" style="width: 32px;"/> | x86_64 | [lighthouse-${{ env.VERSION }}-x86_64-apple-darwin-portable.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-apple-darwin-portable.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-apple-darwin-portable.tar.gz.asc) |
257240
| <img src="https://simpleicons.org/icons/linux.svg" style="width: 32px;"/> | x86_64 | [lighthouse-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz.asc) |
258-
| <img src="https://simpleicons.org/icons/linux.svg" style="width: 32px;"/> | x86_64 | [lighthouse-${{ env.VERSION }}-x86_64-unknown-linux-gnu-portable.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-unknown-linux-gnu-portable.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-unknown-linux-gnu-portable.tar.gz.asc) |
259241
| <img src="https://simpleicons.org/icons/raspberrypi.svg" style="width: 32px;"/> | aarch64 | [lighthouse-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz.asc) |
260-
| <img src="https://simpleicons.org/icons/raspberrypi.svg" style="width: 32px;"/> | aarch64 | [lighthouse-${{ env.VERSION }}-aarch64-unknown-linux-gnu-portable.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-aarch64-unknown-linux-gnu-portable.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-aarch64-unknown-linux-gnu-portable.tar.gz.asc) |
261-
| <img src="https://simpleicons.org/icons/windows.svg" style="width: 32px;"/> | x86_64 | [lighthouse-${{ env.VERSION }}-x86_64-windows.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-windows.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-windows.tar.gz.asc) |
262-
| <img src="https://simpleicons.org/icons/windows.svg" style="width: 32px;"/> | x86_64 | [lighthouse-${{ env.VERSION }}-x86_64-windows-portable.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-windows-portable.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-windows-portable.tar.gz.asc) |
242+
| <img src="https://upload.wikimedia.org/wikipedia/commons/c/c4/Windows_logo_-_2021_%28Black%29.svg" style="width: 32px;"/> | x86_64 | [lighthouse-${{ env.VERSION }}-x86_64-windows.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-windows.tar.gz) | [PGP Signature](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/lighthouse-${{ env.VERSION }}-x86_64-windows.tar.gz.asc) |
263243
| | | | |
264244
| **System** | **Option** | - | **Resource** |
265245
| <img src="https://simpleicons.org/icons/docker.svg" style="width: 32px;"/> | Docker | [${{ env.VERSION }}](https://hub.docker.com/r/${{ env.IMAGE_NAME }}/tags?page=1&ordering=last_updated&name=${{ env.VERSION }}) | [${{ env.IMAGE_NAME }}](https://hub.docker.com/r/${{ env.IMAGE_NAME }}) |

‎.github/workflows/test-suite.yml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,20 @@ jobs:
5454
done
5555
echo "skip_ci=$SKIP_CI" >> $GITHUB_OUTPUT
5656
57+
lockbud:
58+
name: lockbud
59+
runs-on: ubuntu-latest
60+
container:
61+
image: sigmaprime/lockbud:latest
62+
steps:
63+
- name: Checkout repository
64+
uses: actions/checkout@v3
65+
- name: Install dependencies
66+
run: apt update && apt install -y cmake libclang-dev
67+
- name: Check for deadlocks
68+
run: |
69+
cargo lockbud -k deadlock -b -l tokio_util
70+
5771
target-branch-check:
5872
name: target-branch-check
5973
runs-on: ubuntu-latest
@@ -69,6 +83,11 @@ jobs:
6983
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
7084
steps:
7185
- uses: actions/checkout@v4
86+
# Set Java version to 21. (required since Web3Signer 24.12.0).
87+
- uses: actions/setup-java@v4
88+
with:
89+
distribution: 'temurin'
90+
java-version: '21'
7291
- name: Get latest version of stable Rust
7392
if: env.SELF_HOSTED_RUNNERS == 'false'
7493
uses: moonrepo/setup-rust@v1
@@ -173,8 +192,19 @@ jobs:
173192
channel: stable
174193
cache-target: release
175194
bins: cargo-nextest
195+
- name: Create CI logger dir
196+
run: mkdir ${{ runner.temp }}/network_test_logs
176197
- name: Run network tests for all known forks
177198
run: make test-network
199+
env:
200+
TEST_FEATURES: portable,ci_logger
201+
CI_LOGGER_DIR: ${{ runner.temp }}/network_test_logs
202+
- name: Upload logs
203+
uses: actions/upload-artifact@v4
204+
with:
205+
name: network_test_logs
206+
path: ${{ runner.temp }}/network_test_logs
207+
178208
slasher-tests:
179209
name: slasher-tests
180210
needs: [check-labels]
@@ -395,7 +425,7 @@ jobs:
395425
channel: stable
396426
cache-target: release
397427
- name: Run Makefile to trigger the bash script
398-
run: make cli
428+
run: make cli-local
399429
# This job succeeds ONLY IF all others succeed. It is used by the merge queue to determine whether
400430
# a PR is safe to merge. New jobs should be added here.
401431
test-suite-success:
@@ -422,6 +452,7 @@ jobs:
422452
'cargo-udeps',
423453
'compile-with-beta-compiler',
424454
'cli-check',
455+
'lockbud',
425456
]
426457
steps:
427458
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)