Skip to content

Commit

Permalink
Fix Kurtosis, web3signer and cargo-audit for CI (#6671)
Browse files Browse the repository at this point in the history
* 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).
  • Loading branch information
michaelsproul authored Dec 10, 2024
1 parent c042dc1 commit e9ec67e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/local-testnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: |
echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
sudo apt update
sudo apt install -y kurtosis-cli=1.3.1
sudo apt install -y kurtosis-cli
kurtosis analytics disable
- name: Download Docker image artifact
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
run: |
echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
sudo apt update
sudo apt install -y kurtosis-cli=1.3.1
sudo apt install -y kurtosis-cli
kurtosis analytics disable
- name: Download Docker image artifact
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
run: |
echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
sudo apt update
sudo apt install -y kurtosis-cli=1.3.1
sudo apt install -y kurtosis-cli
kurtosis analytics disable
- name: Download Docker image artifact
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ jobs:
runs-on: ${{ github.repository == 'sigp/lighthouse' && fromJson('["self-hosted", "linux", "CI", "large"]') || 'ubuntu-latest' }}
steps:
- uses: actions/checkout@v4
# Set Java version to 21. (required since Web3Signer 24.12.0).
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
- name: Get latest version of stable Rust
if: env.SELF_HOSTED_RUNNERS == 'false'
uses: moonrepo/setup-rust@v1
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ install-audit:
cargo install --force cargo-audit

audit-CI:
cargo audit
cargo audit --ignore RUSTSEC-2024-0421

# Runs `cargo vendor` to make sure dependencies can be vendored for packaging, reproducibility and archival purpose.
vendor:
Expand Down
4 changes: 2 additions & 2 deletions scripts/tests/doppelganger_protection.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ if [[ "$BEHAVIOR" == "failure" ]]; then
# This process should not last longer than 2 epochs
vc_1_range_start=0
vc_1_range_end=$(($KEYS_PER_NODE - 1))
vc_1_keys_artifact_id="1-lighthouse-geth-$vc_1_range_start-$vc_1_range_end-0"
vc_1_keys_artifact_id="1-lighthouse-geth-$vc_1_range_start-$vc_1_range_end"
service_name=vc-1-doppelganger

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

vc_4_range_start=$(($KEYS_PER_NODE * 3))
vc_4_range_end=$(($KEYS_PER_NODE * 4 - 1))
vc_4_keys_artifact_id="4-lighthouse-geth-$vc_4_range_start-$vc_4_range_end-0"
vc_4_keys_artifact_id="4-lighthouse-geth-$vc_4_range_start-$vc_4_range_end"
service_name=vc-4

kurtosis service add \
Expand Down

0 comments on commit e9ec67e

Please sign in to comment.