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 1559279e41aa9..8a8f02e79e5dd 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..af8c2b42bf00f 100644 --- a/flake.nix +++ b/flake.nix @@ -130,7 +130,7 @@ gnused gnugrep gnutar - go_1_22 + unstablePkgs.go_1_24 go-migrate (pinnedPkgs.golangci-lint) gopls @@ -196,7 +196,7 @@ # slim bundle into it's own derivation. buildFat = osArch: - pkgs.buildGo122Module { + unstablePkgs.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 d3e9c55f3d937..826d5cd2c0235 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