diff --git a/Dockerfile b/Dockerfile index e315706b..4acda707 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ ARG GOMODJAIL_VERSION=v0.1.2@0a86b34442a491fa8f5e4565e9c846fce310239c ARG GO_VERSION=1.24 ARG UBUNTU_VERSION=24.04 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1 -ARG GOTESTSUM_VERSION=v1.12.2 +ARG GOTESTSUM_VERSION=0d9599e513d70e5792bb9334869f82f6e8b53d4d ARG NYDUS_VERSION=v2.3.1 ARG SOCI_SNAPSHOTTER_VERSION=0.9.0 ARG KUBO_VERSION=v0.34.1 diff --git a/Makefile b/Makefile index 1026a744..9d9602e1 100644 --- a/Makefile +++ b/Makefile @@ -218,12 +218,14 @@ install-dev-tools: # git-validation: main (2025-02-25) # ltag: main (2025-03-04) # go-licenses: v2.0.0-alpha.1 (2024-06-27) + # stubbing go-licenses with dependency upgrade due to non-compatibility with golang 1.25rc1 + # Issue: https://github.com/google/go-licenses/issues/312 @cd $(MAKEFILE_DIR) \ + && go install github.com/Shubhranshu153/go-licenses/v2@f8c503d1357dffb6c97ed3b94e912ab294dde24a \ && go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@2b224c2cf4c9f261c22a16af7f8ca6408467f338 \ && go install github.com/vbatts/git-validation@7b60e35b055dd2eab5844202ffffad51d9c93922 \ && go install github.com/containerd/ltag@66e6a514664ee2d11a470735519fa22b1a9eaabd \ - && go install github.com/google/go-licenses/v2@d01822334fba5896920a060f762ea7ecdbd086e8 \ - && go install gotest.tools/gotestsum@ac6dad9c7d87b969004f7749d1942938526c9716 + && go install gotest.tools/gotestsum@0d9599e513d70e5792bb9334869f82f6e8b53d4d @echo "Remember to add \$$HOME/go/bin to your path" $(call footer, $@) diff --git a/hack/build-integration-canary.sh b/hack/build-integration-canary.sh index ae205c90..725628b9 100755 --- a/hack/build-integration-canary.sh +++ b/hack/build-integration-canary.sh @@ -28,7 +28,9 @@ readonly root # "Blacklisting" here means that any dependency which name is blacklisted will be left untouched, at the version # currently pinned in the Dockerfile. # This is convenient so that currently broken alpha/beta/RC can be held back temporarily to keep the build green -blacklist=() +# TODO: Blacklisting gotestsum until a new version compatible with golang v1.25rc1 is released +# Issue: https://github.com/google/go-licenses/issues/312 +blacklist=(gotestsum) # List all the repositories we depend on to build and run integration tests dependencies=( diff --git a/mod/tigron/Makefile b/mod/tigron/Makefile index ba2bbf0d..de48ce35 100644 --- a/mod/tigron/Makefile +++ b/mod/tigron/Makefile @@ -168,11 +168,13 @@ install-dev-tools: # git-validation: main (2025-02-25) # ltag: main (2025-03-04) # go-licenses: v2.0.0-alpha.1 (2024-06-27) + # stubbing go-licenses with dependency upgrade due to non-compatibility with golang 1.25rc1 + # Issue: https://github.com/google/go-licenses/issues/312 @cd $(MAKEFILE_DIR) \ && go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@2b224c2cf4c9f261c22a16af7f8ca6408467f338 \ && go install github.com/vbatts/git-validation@7b60e35b055dd2eab5844202ffffad51d9c93922 \ && go install github.com/containerd/ltag@66e6a514664ee2d11a470735519fa22b1a9eaabd \ - && go install github.com/google/go-licenses/v2@d01822334fba5896920a060f762ea7ecdbd086e8 + && go install github.com/Shubhranshu153/go-licenses/v2@f8c503d1357dffb6c97ed3b94e912ab294dde24a @echo "Remember to add \$$HOME/go/bin to your path" $(call footer, $@)