Skip to content

Commit e9ec67e

Browse files
Fix Kurtosis, web3signer and cargo-audit for CI (#6671)
* Update kurtosis-cli * Fix name of Kurtosis artefact used in doppelganger tests * Ignore idna vuln * Set Java Version to 21 (required since Web3Signer 24.12.0).
1 parent c042dc1 commit e9ec67e

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.github/workflows/local-testnet.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: |
4141
echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
4242
sudo apt update
43-
sudo apt install -y kurtosis-cli=1.3.1
43+
sudo apt install -y kurtosis-cli
4444
kurtosis analytics disable
4545
4646
- name: Download Docker image artifact
@@ -86,7 +86,7 @@ jobs:
8686
run: |
8787
echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
8888
sudo apt update
89-
sudo apt install -y kurtosis-cli=1.3.1
89+
sudo apt install -y kurtosis-cli
9090
kurtosis analytics disable
9191
9292
- name: Download Docker image artifact
@@ -121,7 +121,7 @@ jobs:
121121
run: |
122122
echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
123123
sudo apt update
124-
sudo apt install -y kurtosis-cli=1.3.1
124+
sudo apt install -y kurtosis-cli
125125
kurtosis analytics disable
126126
127127
- name: Download Docker image artifact

.github/workflows/test-suite.yml

+5
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ jobs:
8383
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
8484
steps:
8585
- 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'
8691
- name: Get latest version of stable Rust
8792
if: env.SELF_HOSTED_RUNNERS == 'false'
8893
uses: moonrepo/setup-rust@v1

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ install-audit:
240240
cargo install --force cargo-audit
241241

242242
audit-CI:
243-
cargo audit
243+
cargo audit --ignore RUSTSEC-2024-0421
244244

245245
# Runs `cargo vendor` to make sure dependencies can be vendored for packaging, reproducibility and archival purpose.
246246
vendor:

scripts/tests/doppelganger_protection.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if [[ "$BEHAVIOR" == "failure" ]]; then
7171
# This process should not last longer than 2 epochs
7272
vc_1_range_start=0
7373
vc_1_range_end=$(($KEYS_PER_NODE - 1))
74-
vc_1_keys_artifact_id="1-lighthouse-geth-$vc_1_range_start-$vc_1_range_end-0"
74+
vc_1_keys_artifact_id="1-lighthouse-geth-$vc_1_range_start-$vc_1_range_end"
7575
service_name=vc-1-doppelganger
7676

7777
kurtosis service add \
@@ -107,7 +107,7 @@ if [[ "$BEHAVIOR" == "success" ]]; then
107107

108108
vc_4_range_start=$(($KEYS_PER_NODE * 3))
109109
vc_4_range_end=$(($KEYS_PER_NODE * 4 - 1))
110-
vc_4_keys_artifact_id="4-lighthouse-geth-$vc_4_range_start-$vc_4_range_end-0"
110+
vc_4_keys_artifact_id="4-lighthouse-geth-$vc_4_range_start-$vc_4_range_end"
111111
service_name=vc-4
112112

113113
kurtosis service add \

0 commit comments

Comments
 (0)