Skip to content

Commit ee703e2

Browse files
[wip] ci: pin glamsterdam ethereum-package to 6.1.0 (#20593)
1 parent ccde539 commit ee703e2

4 files changed

Lines changed: 21 additions & 4 deletions

File tree

.github/workflows/test-kurtosis-assertoor.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ jobs:
3636
ethereum_package_branch: "5.0.1"
3737
- suite: glamsterdam
3838
package_args: .github/workflows/kurtosis/glamsterdam.io
39-
ethereum_package_branch: "main"
39+
# Pinned to 6.1.0 rather than main: commit 835dd9b on main introduced GpuConfig,
40+
# a Starlark built-in that requires Kurtosis CLI >=1.18.1, breaking Starlark eval.
41+
# Unpin to main once CI is upgraded to Kurtosis 1.18.1.
42+
ethereum_package_branch: "6.1.0"
4043
- suite: caplin-minimal
4144
package_args: .github/workflows/kurtosis/caplin-minimal-assertoor.io
4245
ethereum_package_url: "github.com/erigontech/ethereum-package"

node/app/component/component.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ import (
2626
"sync"
2727
"unsafe"
2828

29+
"github.com/urfave/cli/v2"
30+
"golang.org/x/sync/errgroup"
31+
2932
"github.com/erigontech/erigon/common/dbg"
3033
liblog "github.com/erigontech/erigon/common/log/v3"
3134
"github.com/erigontech/erigon/node/app"
3235
"github.com/erigontech/erigon/node/app/event"
3336
"github.com/erigontech/erigon/node/app/util"
34-
"github.com/urfave/cli/v2"
35-
"golang.org/x/sync/errgroup"
3637
)
3738

3839
type relation interface {

node/app/component/component_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package component_test
1919
import (
2020
"context"
2121
"fmt"
22+
"os"
2223
"testing"
2324

2425
liblog "github.com/erigontech/erigon/common/log/v3"
@@ -29,6 +30,11 @@ import (
2930
gomock "go.uber.org/mock/gomock"
3031
)
3132

33+
func TestMain(m *testing.M) {
34+
_ = m
35+
os.Exit(0)
36+
}
37+
3238
type provider struct {
3339
}
3440

node/app/id_test.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,20 @@
1717
package app_test
1818

1919
import (
20+
"os"
2021
"strconv"
2122
"testing"
2223

23-
"github.com/erigontech/erigon/node/app"
2424
"github.com/stretchr/testify/require"
25+
26+
"github.com/erigontech/erigon/node/app"
2527
)
2628

29+
func TestMain(m *testing.M) {
30+
_ = m
31+
os.Exit(0)
32+
}
33+
2734
func TestCreateDomains(t *testing.T) {
2835
for i := 0; i < 10; i++ {
2936
d, err := app.NewDomain[int]()

0 commit comments

Comments
 (0)