Skip to content

Commit 4ff81d9

Browse files
fix: go-license dependency
Signed-off-by: shubhranshu153 <[email protected]>
1 parent 401800a commit 4ff81d9

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ARG GOMODJAIL_VERSION=v0.1.2@0a86b34442a491fa8f5e4565e9c846fce310239c
4747
ARG GO_VERSION=1.24
4848
ARG UBUNTU_VERSION=24.04
4949
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
50-
ARG GOTESTSUM_VERSION=v1.12.2
50+
ARG GOTESTSUM_VERSION=0d9599e513d70e5792bb9334869f82f6e8b53d4d
5151
ARG NYDUS_VERSION=v2.3.1
5252
ARG SOCI_SNAPSHOTTER_VERSION=0.9.0
5353
ARG KUBO_VERSION=v0.34.1

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,14 @@ install-dev-tools:
218218
# git-validation: main (2025-02-25)
219219
# ltag: main (2025-03-04)
220220
# go-licenses: v2.0.0-alpha.1 (2024-06-27)
221+
# stubbing go-licenses with dependency upgrade due to non-compatibility with golang 1.25rc1
222+
# Issue: https://github.com/google/go-licenses/issues/312
221223
@cd $(MAKEFILE_DIR) \
224+
&& go install github.com/Shubhranshu153/go-licenses/v2@f8c503d1357dffb6c97ed3b94e912ab294dde24a \
222225
&& go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@2b224c2cf4c9f261c22a16af7f8ca6408467f338 \
223226
&& go install github.com/vbatts/git-validation@7b60e35b055dd2eab5844202ffffad51d9c93922 \
224227
&& go install github.com/containerd/ltag@66e6a514664ee2d11a470735519fa22b1a9eaabd \
225-
&& go install github.com/google/go-licenses/v2@d01822334fba5896920a060f762ea7ecdbd086e8 \
226-
&& go install gotest.tools/gotestsum@ac6dad9c7d87b969004f7749d1942938526c9716
228+
&& go install gotest.tools/gotestsum@0d9599e513d70e5792bb9334869f82f6e8b53d4d
227229
@echo "Remember to add \$$HOME/go/bin to your path"
228230
$(call footer, $@)
229231

hack/build-integration-canary.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ readonly root
2828
# "Blacklisting" here means that any dependency which name is blacklisted will be left untouched, at the version
2929
# currently pinned in the Dockerfile.
3030
# This is convenient so that currently broken alpha/beta/RC can be held back temporarily to keep the build green
31-
blacklist=()
31+
# TODO: Blacklisting gotestsum until a new version compatible with golang v1.25rc1 is released
32+
# Issue: https://github.com/google/go-licenses/issues/312
33+
blacklist=(gotestsum)
3234

3335
# List all the repositories we depend on to build and run integration tests
3436
dependencies=(
@@ -220,6 +222,7 @@ canary::build::integration(){
220222
shortname="${dep##*/}"
221223
[ "$shortname" != "plugins" ] || shortname="cni-plugins"
222224
[ "$shortname" != "fuse-overlayfs-snapshotter" ] || shortname="containerd-fuse-overlayfs"
225+
log::info "Processing $shortname"
223226
for bl in "${blacklist[@]}"; do
224227
if [ "$bl" == "$shortname" ]; then
225228
log::warning "Dependency $shortname is blacklisted and will be left to its currently pinned version"

mod/tigron/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,13 @@ install-dev-tools:
168168
# git-validation: main (2025-02-25)
169169
# ltag: main (2025-03-04)
170170
# go-licenses: v2.0.0-alpha.1 (2024-06-27)
171+
# stubbing go-licenses with dependency upgrade due to non-compatibility with golang 1.25rc1
172+
# Issue: https://github.com/google/go-licenses/issues/312
171173
@cd $(MAKEFILE_DIR) \
172174
&& go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@2b224c2cf4c9f261c22a16af7f8ca6408467f338 \
173175
&& go install github.com/vbatts/git-validation@7b60e35b055dd2eab5844202ffffad51d9c93922 \
174176
&& go install github.com/containerd/ltag@66e6a514664ee2d11a470735519fa22b1a9eaabd \
175-
&& go install github.com/google/go-licenses/v2@d01822334fba5896920a060f762ea7ecdbd086e8
177+
&& go install github.com/Shubhranshu153/go-licenses/v2@f8c503d1357dffb6c97ed3b94e912ab294dde24a
176178
@echo "Remember to add \$$HOME/go/bin to your path"
177179
$(call footer, $@)
178180

0 commit comments

Comments
 (0)