From 598d44185e8d2b4240b199103d8b2f6a6e85f076 Mon Sep 17 00:00:00 2001 From: maru Date: Wed, 24 Sep 2025 04:53:20 +0000 Subject: [PATCH 1/2] Move ginkgo tool usage to the main go.mod from tools/go.mod CI logs were reporting that the version of the ginkgo CLI was divergent from the version used by our test suites. Since most of ginkgo's dependencies are already represented in the main module, the risk of unwanted dependency pollution is low and managing ginkgo only in the main module avoids having to synchronize the version across the 2 modules. --- .github/CODEOWNERS | 1 + go.mod | 8 +++++--- go.sum | 11 ++++++----- scripts/run_ginkgo.sh | 2 +- tools/go.mod | 3 --- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ea461542446e..05c42bcdb058 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -28,6 +28,7 @@ /tests/ @joshua-kim @maru-ava /tests/*.md @joshua-kim @maru-ava @meaghanfitzgerald /tests/reexecute/ @aaronbuchwald +/tools/* @joshua-kim @maru-ava /x/blockdb @DracoLi /x/merkledb @joshua-kim @rrazvan1 /x/sync @joshua-kim @rrazvan1 diff --git a/go.mod b/go.mod index de7a87b6acad..414c42578486 100644 --- a/go.mod +++ b/go.mod @@ -78,7 +78,7 @@ require ( gonum.org/v1/gonum v0.11.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed google.golang.org/grpc v1.66.0 - google.golang.org/protobuf v1.36.5 + google.golang.org/protobuf v1.36.7 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.29.0 @@ -122,7 +122,7 @@ require ( github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect github.com/getsentry/sentry-go v0.18.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect @@ -136,7 +136,7 @@ require ( github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect + github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/hashicorp/go-bexpr v0.1.10 // indirect @@ -206,3 +206,5 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) + +tool github.com/onsi/ginkgo/v2/ginkgo diff --git a/go.sum b/go.sum index adad78d2c2a6..e9dded72f55e 100644 --- a/go.sum +++ b/go.sum @@ -235,8 +235,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= @@ -341,8 +341,9 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20230207041349-798e818bf904 h1:4/hN5RUoecvl+RmJRE2YxKWtnnQls6rQjjW5oV7qg2U= github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg= +github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8= +github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg= github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4= @@ -1084,8 +1085,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= -google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A= +google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/scripts/run_ginkgo.sh b/scripts/run_ginkgo.sh index 5ada204f3a15..a5cbbb50b382 100755 --- a/scripts/run_ginkgo.sh +++ b/scripts/run_ginkgo.sh @@ -3,4 +3,4 @@ set -euo pipefail AVALANCHE_PATH=$(cd "$( dirname "${BASH_SOURCE[0]}" )"; cd .. && pwd ) -"${AVALANCHE_PATH}"/scripts/run_tool.sh ginkgo "${@}" +cd "${AVALANCHE_PATH}" && go tool ginkgo "${@}" diff --git a/tools/go.mod b/tools/go.mod index 5910dee01e02..84d57bbaf5e8 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -18,7 +18,6 @@ go 1.24.7 tool ( github.com/go-task/task/v3/cmd/task github.com/golangci/golangci-lint/v2/cmd/golangci-lint - github.com/onsi/ginkgo/v2/ginkgo github.com/palantir/go-license github.com/rhysd/actionlint/cmd/actionlint ) @@ -105,7 +104,6 @@ require ( github.com/golangci/revgrep v0.8.0 // indirect github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect github.com/google/go-cmp v0.7.0 // indirect - github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect github.com/gordonklaus/ineffassign v0.1.0 // indirect github.com/gostaticanalysis/analysisutil v0.7.1 // indirect github.com/gostaticanalysis/comment v1.5.0 // indirect @@ -160,7 +158,6 @@ require ( github.com/nmiyake/pkg/errorstringer v1.1.0 // indirect github.com/nunnatsa/ginkgolinter v0.19.1 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/onsi/ginkgo/v2 v2.23.3 // indirect github.com/palantir/go-license v1.25.0 // indirect github.com/palantir/godel/v2 v2.82.0 // indirect github.com/palantir/pkg v1.1.0 // indirect From 6ce626f3c6e5943c061e712acef81267aa950d44 Mon Sep 17 00:00:00 2001 From: maru Date: Wed, 24 Sep 2025 05:34:43 +0000 Subject: [PATCH 2/2] fixup: Ensure setup-go-for-project caches tools/go.mod --- .github/actions/setup-go-for-project/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/setup-go-for-project/action.yml b/.github/actions/setup-go-for-project/action.yml index 430ae76d1a91..87aebb5a73a5 100644 --- a/.github/actions/setup-go-for-project/action.yml +++ b/.github/actions/setup-go-for-project/action.yml @@ -20,3 +20,6 @@ runs: uses: actions/setup-go@v5 with: go-version-file: go.mod + cache-dependency-path: | + go.sum + tools/go.sum