Skip to content

fix: fixing the CI updating ubuntu and go #1433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ permissions:
jobs:
compile-native:
name: Build native libraries
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Go
# NOTE: this action comes with caching by default
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.24"
cache-dependency-path: |
native/libp2p_port/go.sum
- name: Cache output artifacts
Expand All @@ -58,7 +58,7 @@ jobs:

download-beacon-node-oapi:
name: Download Beacon Node OAPI
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Cache Beacon Node OAPI
Expand All @@ -75,7 +75,7 @@ jobs:
build:
name: Build project
needs: [compile-native, download-beacon-node-oapi]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Elixir
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:

docker-build:
name: Build Docker image
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
Expand All @@ -150,7 +150,7 @@ jobs:
smoke:
name: Start and stop the node
needs: [compile-native, download-beacon-node-oapi]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Elixir
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
test:
name: Test
needs: [compile-native, download-beacon-node-oapi]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Elixir
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:

lint:
name: Lint
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Elixir
Expand Down Expand Up @@ -273,7 +273,7 @@ jobs:

download-spectests:
name: Download spectests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Cache compressed spectests
Expand All @@ -295,7 +295,7 @@ jobs:
matrix:
fork: ["deneb"]
config: ["minimal", "general", "mainnet"]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up Elixir
Expand Down Expand Up @@ -357,7 +357,7 @@ jobs:
spectests-success:
name: All spec-tests passed
needs: spectests-matrix
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: always()
steps:
- if: needs.spectests-matrix.result == 'success'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci_skipped.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,36 @@ on:
jobs:
compile-native:
name: Build native libraries
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: false
steps: [run: true]

build:
name: Build project
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: false
steps: [run: true]

smoke:
name: Start and stop the node
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: false
steps: [run: true]

test:
name: Test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: false
steps: [run: true]

lint:
name: Lint
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: false
steps: [run: true]

spectests-success:
name: All spec-tests passed
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: false
steps: [run: true]
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
erlang 26.2
elixir 1.16.2-otp-26
golang 1.22.12
golang 1.24.2
rust 1.81.0
protoc 30.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# libp2p port
FROM golang:1.22 AS libp2p_builder
FROM golang:1.24 AS libp2p_builder
LABEL stage=builder

# Install dependencies
Expand Down Expand Up @@ -120,4 +120,4 @@
# TODO: This could be an issue regarding OS signals, we should use JSONArgs but shell form is the
# only way to pass args to ENTRYPOINT, specially important because of the cookie. Best
# solution would be to move to releases and avoid starting the node manually through iex.
ENTRYPOINT iex $IEX_ARGS_VALUE -S mix run -- $0 $@

Check warning on line 123 in Dockerfile

View workflow job for this annotation

GitHub Actions / ethereum-testnet

JSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals

JSONArgsRecommended: JSON arguments recommended for ENTRYPOINT to prevent unintended behavior related to OS signals More info: https://docs.docker.com/go/dockerfile/rule/json-args-recommended/

Check warning on line 123 in Dockerfile

View workflow job for this annotation

GitHub Actions / Build Docker image

JSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals

JSONArgsRecommended: JSON arguments recommended for ENTRYPOINT to prevent unintended behavior related to OS signals More info: https://docs.docker.com/go/dockerfile/rule/json-args-recommended/
4 changes: 2 additions & 2 deletions test/unit/validator/block_builder_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ defmodule Unit.Validator.BlockBuilderTest do

[proof] = BlockBuilder.compute_inclusion_proofs(body)

assert length(proof) == 9
assert length(proof) == 10
Copy link
Collaborator Author

@rodrigo-o rodrigo-o Apr 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was changed in #1432, the change was modifying KZG_COMMITMENT_INCLUSION_PROOF_DEPTH from 9 to 10 as per the updated spec


commitment_root = SszEx.hash_tree_root!(commitment, TypeAliases.kzg_commitment())

# Manually computed generalized index of the commitment in the body
index = 0b101100000
index = 0b1011000000

valid? =
Predicates.valid_merkle_branch?(commitment_root, proof, length(proof), index, body_root)
Expand Down
Loading