Skip to content

Commit

Permalink
revert(docker): Revert "Revert Upgrade Go to version 1.22.0"
Browse files Browse the repository at this point in the history
The upgrade has been reverted because it broke the fun tests for
`GoDep`. The removal of `GoDep`, in a preceeding change, has unblocked
upgrading Go. So, revert that to finally do the upgrade.

This reverts commit 58332a0.

Fixes: #8443.

Signed-off-by: Frank Viernau <[email protected]>
  • Loading branch information
fviernau committed Apr 5, 2024
1 parent f54813e commit 3ce77c7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .versions
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COMPOSER_VERSION=2.2
CONAN_VERSION=1.63.0
DART_VERSION=2.18.4
DOTNET_VERSION=6.0
GO_VERSION=1.21.6
GO_VERSION=1.22.0
HASKELL_STACK_VERSION=2.13.1
JAVA_VERSION=17
LICENSEE_VERSION=9.15.3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ COPY --from=rustbuild /opt/rust /opt/rust
# GOLANG - Build as a separate component
FROM base AS gobuild

ARG GO_VERSION=1.21.6
ARG GO_VERSION=1.22.0
ENV GOBIN=/opt/go/bin
ENV PATH=$PATH:/opt/go/bin

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-legacy
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ ENV \
COMPOSER_VERSION=2.2.6-2ubuntu4 \
CONAN_VERSION=1.63.0 \
DOTNET_VERSION=6.0 \
GO_VERSION=1.21.6 \
GO_VERSION=1.22.0 \
HASKELL_STACK_VERSION=2.13.1 \
NPM_VERSION=10.1.0 \
PNPM_VERSION=8.10.3 \
Expand Down

0 comments on commit 3ce77c7

Please sign in to comment.