From 0b790c3261e6aaca0031f7a7c6e73818f1928f2b Mon Sep 17 00:00:00 2001 From: Eric Paulsen Date: Fri, 11 Apr 2025 08:01:34 +0000 Subject: [PATCH 1/4] chore: update Go to 1.24.2 This updates Go to the latest stable patch version (1.24.2) in: - go.mod - dogfood/coder/Dockerfile - .github/actions/setup-go/action.yaml - flake.nix --- .github/actions/setup-go/action.yaml | 2 +- dogfood/coder/Dockerfile | 2 +- flake.nix | 4 ++-- go.mod | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup-go/action.yaml b/.github/actions/setup-go/action.yaml index 7858b8ecc6cac..76b7c5d87d206 100644 --- a/.github/actions/setup-go/action.yaml +++ b/.github/actions/setup-go/action.yaml @@ -4,7 +4,7 @@ description: | inputs: version: description: "The Go version to use." - default: "1.24.1" + default: "1.24.2" runs: using: "composite" steps: diff --git a/dogfood/coder/Dockerfile b/dogfood/coder/Dockerfile index b17d4c49563d3..b8297eb886519 100644 --- a/dogfood/coder/Dockerfile +++ b/dogfood/coder/Dockerfile @@ -9,7 +9,7 @@ RUN cargo install typos-cli watchexec-cli && \ FROM ubuntu:jammy@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 AS go # Install Go manually, so that we can control the version -ARG GO_VERSION=1.24.1 +ARG GO_VERSION=1.24.2 # Boring Go is needed to build FIPS-compliant binaries. RUN apt-get update && \ diff --git a/flake.nix b/flake.nix index bb8f466383f04..5d4e8385f0343 100644 --- a/flake.nix +++ b/flake.nix @@ -130,7 +130,7 @@ gnused gnugrep gnutar - go_1_22 + go_1_24 go-migrate (pinnedPkgs.golangci-lint) gopls @@ -196,7 +196,7 @@ # slim bundle into it's own derivation. buildFat = osArch: - pkgs.buildGo122Module { + pkgs.buildGo124Module { name = "coder-${osArch}"; # Updated with ./scripts/update-flake.sh`. # This should be updated whenever go.mod changes! diff --git a/go.mod b/go.mod index 8fe432f0418bf..0199878b542e4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/coder/coder/v2 -go 1.24.1 +go 1.24.2 // 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 From bf0d2d69f26ccf66db7d41306c8ad0867ba7faf2 Mon Sep 17 00:00:00 2001 From: Eric Paulsen Date: Wed, 16 Apr 2025 17:21:16 +0200 Subject: [PATCH 2/4] update flake.nix Co-authored-by: Thomas Kosiewski --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 5d4e8385f0343..e243027d46faa 100644 --- a/flake.nix +++ b/flake.nix @@ -130,7 +130,7 @@ gnused gnugrep gnutar - go_1_24 + unstablePkgs.go_1_24 go-migrate (pinnedPkgs.golangci-lint) gopls From dc4ab5ee3bb1962f1beb33c820f85cfff853a191 Mon Sep 17 00:00:00 2001 From: Eric Paulsen Date: Wed, 16 Apr 2025 17:22:04 +0200 Subject: [PATCH 3/4] update flake.nix Co-authored-by: Thomas Kosiewski From a9fe2e0a45101af4b34be158c94a3454c199a314 Mon Sep 17 00:00:00 2001 From: Eric Paulsen Date: Wed, 16 Apr 2025 17:24:15 +0200 Subject: [PATCH 4/4] Update flake.nix Co-authored-by: Thomas Kosiewski --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e243027d46faa..af8c2b42bf00f 100644 --- a/flake.nix +++ b/flake.nix @@ -196,7 +196,7 @@ # slim bundle into it's own derivation. buildFat = osArch: - pkgs.buildGo124Module { + unstablePkgs.buildGo124Module { name = "coder-${osArch}"; # Updated with ./scripts/update-flake.sh`. # This should be updated whenever go.mod changes!