shishantbiswas/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-06-02 20:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update Go from 1.25.6 to 1.25.7 (#22042) (#24221)

Browse Source 
Cherry-pick of e82edf1b6b onto
`release/2.29`.

Original PR: #22042

**Conflict resolution:** `testutil/unixsocket.go` was deleted on
`release/2.29` but modified in the original commit — resolved by keeping
it deleted.

**Note:** Merge #24245 first to fix pre-existing CI failures on
`release/2.29`.

> 🤖 Generated by Coder Agents

Co-authored-by: Jon Ayers <jon@coder.com>
This commit is contained in:
Garrett Delfosse
2026-04-10 13:58:12 -04:00
committed by GitHub
parent ccba5732aa
commit b0cfd1a3b5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/actions/setup-go/action.yaml
+1 -1
View File
@@ -4,7 +4,7 @@ description: |
inputs: inputs:
version: version:
description: "The Go version to use." description: "The Go version to use."
default: "1.25.6" default: "1.25.7"
use-preinstalled-go: use-preinstalled-go:
description: "Whether to use preinstalled Go." description: "Whether to use preinstalled Go."
default: "false" default: "false"
dogfood/coder/Dockerfile
+2 -2
View File
@@ -11,8 +11,8 @@ RUN cargo install jj-cli typos-cli watchexec-cli@2.3.2
FROM ubuntu:jammy@sha256:104ae83764a5119017b8e8d6218fa0832b09df65aae7d5a6de29a85d813da2fb AS go FROM ubuntu:jammy@sha256:104ae83764a5119017b8e8d6218fa0832b09df65aae7d5a6de29a85d813da2fb AS go
# Install Go manually, so that we can control the version # Install Go manually, so that we can control the version
ARG GO_VERSION=1.25.6 ARG GO_VERSION=1.25.7
ARG GO_CHECKSUM="f022b6aad78e362bcba9b0b94d09ad58c5a70c6ba3b7582905fababf5fe0181a" ARG GO_CHECKSUM="12e6d6a191091ae27dc31f6efc630e3a3b8ba409baf3573d955b196fdf086005"
# Boring Go is needed to build FIPS-compliant binaries. # Boring Go is needed to build FIPS-compliant binaries.
RUN apt-get update && \ RUN apt-get update && \
flake.nix
+3 -3
View File
@@ -94,7 +94,7 @@
# 3. Update the sha256 and run again # 3. Update the sha256 and run again
# 4. Nix will fail with the correct vendorHash # 4. Nix will fail with the correct vendorHash
# 5. Update the vendorHash # 5. Update the vendorHash
sqlc-custom = unstablePkgs.buildGo124Module { sqlc-custom = unstablePkgs.buildGo125Module {
pname = "sqlc"; pname = "sqlc";
version = "coder-fork-aab4e865a51df0c43e1839f81a9d349b41d14f05"; version = "coder-fork-aab4e865a51df0c43e1839f81a9d349b41d14f05";
@@ -156,7 +156,7 @@
gnused gnused
gnugrep gnugrep
gnutar gnutar
unstablePkgs.go_1_24 unstablePkgs.go_1_25
gofumpt gofumpt
go-migrate go-migrate
(pinnedPkgs.golangci-lint) (pinnedPkgs.golangci-lint)
@@ -224,7 +224,7 @@
# slim bundle into it's own derivation. # slim bundle into it's own derivation.
buildFat = buildFat =
osArch: osArch:
unstablePkgs.buildGo124Module { unstablePkgs.buildGo125Module {
name = "coder-${osArch}"; name = "coder-${osArch}";
# Updated with ./scripts/update-flake.sh`. # Updated with ./scripts/update-flake.sh`.
# This should be updated whenever go.mod changes! # This should be updated whenever go.mod changes!
go.mod
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/coder/coder/v2 module github.com/coder/coder/v2
go 1.25.6 go 1.25.7
// Required until a v3 of chroma is created to lazily initialize all XML files. // Required until a v3 of chroma is created to lazily initialize all XML files.
// None of our dependencies seem to use the registries anyways, so this // None of our dependencies seem to use the registries anyways, so this