Skip to content

[release-1.25] bump Go #3183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 9, 2025
Merged

[release-1.25] bump Go #3183

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3982b70
bump Go
dhawton Apr 9, 2025
9daafda
fix rust install
dhawton Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/build-tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
################
# Binary tools
################
ARG GOLANG_IMAGE=golang:1.23.7
ARG GOLANG_IMAGE=golang:1.23.8
# hadolint ignore=DL3006
FROM ${GOLANG_IMAGE} AS binary_tools_context_base
# TARGETARCH is an automatic platform ARG enabled by Docker BuildKit.
Expand Down Expand Up @@ -643,7 +643,7 @@ ENV RUSTUP_HOME=/home/.rustup
# hadolint ignore=DL4006
RUN curl --proto '=https' -v --tlsv1.2 -sSf https://sh.rustup.rs | \
sh -s -- -y -v --default-toolchain ${RUST_VERSION} --profile minimal \
--component rustfmt clippy --component llvm-tools &&\
--component rustfmt --component clippy --component llvm-tools &&\
Copy link
Member

@mikemorris mikemorris Apr 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the fix we want (to mirror the change on master in #3157) and if so is it worth updating release-1.24 which was fixed differently in 7d1c19c for consistency?

Refs context in #3160 (comment)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need to touch release 1.24. this fails without so I mirrored master.

/home/.cargo/bin/rustup default ${RUST_VERSION} &&\
/home/.cargo/bin/cargo install rustfilt &&\
mv /home/.cargo/bin/* /usr/bin
Expand Down