From 122c221d0265df5a70aa04bcbb23321aff918523 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 09:29:46 +0200 Subject: [PATCH] chore(deps): bump the go-all group across 1 directory with 3 updates (#2669) * chore(deps): bump the go-all group across 1 directory with 3 updates Bumps the go-all group with 3 updates in the / directory: [github.com/stretchr/testify](https://github.com/stretchr/testify), [golang.org/x/sys](https://github.com/golang/sys) and [golang.org/x/term](https://github.com/golang/term). Updates `github.com/stretchr/testify` from 1.10.0 to 1.11.1 - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.10.0...v1.11.1) Updates `golang.org/x/sys` from 0.35.0 to 0.36.0 - [Commits](https://github.com/golang/sys/compare/v0.35.0...v0.36.0) Updates `golang.org/x/term` from 0.34.0 to 0.35.0 - [Commits](https://github.com/golang/term/compare/v0.34.0...v0.35.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-version: 1.11.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-all - dependency-name: golang.org/x/sys dependency-version: 0.36.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-all - dependency-name: golang.org/x/term dependency-version: 0.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-all ... Signed-off-by: dependabot[bot] * fix lint error * update golangci --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jo Garnier --- .devcontainer/Dockerfile | 7 ++----- ci.Dockerfile | 2 +- go.mod | 10 ++++------ go.sum | 12 ++++++------ pkg/upgrade/upgrade.go | 6 +++--- 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c38d8986..b0f4c31b 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,7 +2,7 @@ FROM docker.io/jguer/yay-builder # Install extra packages (pacman-contrib and fish) -RUN sudo pacman -Syu --noconfirm pacman-contrib fish git-delta openssh bat go +RUN sudo pacman -Syu --noconfirm pacman-contrib fish git-delta openssh bat go github-cli # Set passwordless sudo for the docker user RUN echo "docker ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/docker @@ -14,10 +14,7 @@ USER docker RUN go install github.com/leonelquinteros/gotext/cli/xgotext@latest # Add /app/bin to the PATH -ENV PATH="/app/bin:$PATH" - -# add /home/docker/go/bin to the PATH -ENV PATH="/home/docker/go/bin:$PATH" +ENV PATH="/app/bin:/home/docker/go/bin:PATH" # Set the working directory WORKDIR /workspace diff --git a/ci.Dockerfile b/ci.Dockerfile index 1a5c2182..191d5622 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -11,5 +11,5 @@ COPY go.mod . RUN pacman-key --init && pacman -Sy && pacman -S --overwrite=* --noconfirm archlinux-keyring && \ pacman -Su --overwrite=* --needed --noconfirm pacman doxygen meson asciidoc go git gcc make sudo base-devel && \ rm -rfv /var/cache/pacman/* /var/lib/pacman/sync/* && \ - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v2.1.5 && \ + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v2.4.0 && \ go mod download diff --git a/go.mod b/go.mod index 91e0ef81..59618395 100644 --- a/go.mod +++ b/go.mod @@ -11,10 +11,10 @@ require ( github.com/deckarep/golang-set/v2 v2.8.0 github.com/hashicorp/go-multierror v1.1.1 github.com/leonelquinteros/gotext v1.7.2 - github.com/stretchr/testify v1.10.0 + github.com/stretchr/testify v1.11.1 golang.org/x/net v0.43.0 - golang.org/x/sys v0.35.0 - golang.org/x/term v0.34.0 + golang.org/x/sys v0.36.0 + golang.org/x/term v0.35.0 gopkg.in/h2non/gock.v1 v1.1.2 ) @@ -30,6 +30,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -go 1.23.5 - -toolchain go1.24.0 +go 1.24.0 diff --git a/go.sum b/go.sum index 94a82759..ac6c5c60 100644 --- a/go.sum +++ b/go.sum @@ -51,14 +51,14 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= -golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= +golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY= diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go index e7bddc6b..f507fc2c 100644 --- a/pkg/upgrade/upgrade.go +++ b/pkg/upgrade/upgrade.go @@ -81,8 +81,8 @@ func (u UpSlice) Print(logger *text.Logger) { upgrade := &u.Up[k] left, right := query.GetVersionDiff(upgrade.LocalVersion, upgrade.RemoteVersion) - logger.Printf(text.Magenta(fmt.Sprintf(numberPadding, len(u.Up)-k))) - logger.Printf(namePadding, StylizedNameWithRepository(upgrade)) + logger.Print(text.Magenta(fmt.Sprintf(numberPadding, len(u.Up)-k))) + logger.Print(fmt.Sprintf(namePadding, StylizedNameWithRepository(upgrade))) logger.Printf("%s -> %s\n", fmt.Sprintf(versionPadding, left), right) if upgrade.Extra != "" { logger.Println(strings.Repeat(" ", longestNumber), upgrade.Extra) @@ -100,7 +100,7 @@ func (u UpSlice) PrintDeps(logger *text.Logger) { upgrade := &u.PulledDeps[k] left, right := query.GetVersionDiff(upgrade.LocalVersion, upgrade.RemoteVersion) - logger.Printf(namePadding, StylizedNameWithRepository(upgrade)) + logger.Printf("%s", fmt.Sprintf(namePadding, StylizedNameWithRepository(upgrade))) logger.Printf("%s -> %s\n", fmt.Sprintf(versionPadding, left), right) if upgrade.Extra != "" { logger.Println(strings.Repeat(" ", longestNumber), strings.ToLower(upgrade.Extra))