From aef126054bcdb949b98511cdff1b5e80a010a56d Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Mon, 8 Jul 2024 19:25:33 +0000 Subject: [PATCH 1/2] chore: upgrade Go to 1.22.5 --- .github/actions/setup-go/action.yaml | 2 +- dogfood/Dockerfile | 2 +- flake.nix | 2 +- go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup-go/action.yaml b/.github/actions/setup-go/action.yaml index e3610c76d4085..e7a50897103ae 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.22.4" + default: "1.22.5" runs: using: "composite" steps: diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index eaf244da15e0b..8c12534315007 100644 --- a/dogfood/Dockerfile +++ b/dogfood/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:jammy AS go RUN apt-get update && apt-get install --yes curl gcc # Install Go manually, so that we can control the version -ARG GO_VERSION=1.22.4 +ARG GO_VERSION=1.22.5 RUN mkdir --parents /usr/local/go # Boring Go is needed to build FIPS-compliant binaries. diff --git a/flake.nix b/flake.nix index 6e1aa4a5ffe51..9154d56b62dc7 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,7 @@ name = "coder-${osArch}"; # Updated with ./scripts/update-flake.sh`. # This should be updated whenever go.mod changes! - vendorHash = "sha256-HXDei93ALEImIMgX3Ez829jmJJsf46GwaqPDlleQFmk="; + vendorHash = "sha256-t5t37V0Dq4I5zq2Hj8vdUneTnXfwTRwr8CC7/IW4CgI="; proxyVendor = true; src = ./.; nativeBuildInputs = with pkgs; [ getopt openssl zstd ]; diff --git a/go.mod b/go.mod index 69cbfc9ecdec3..e5400d9e464de 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/coder/coder/v2 -go 1.22.4 +go 1.22.5 // 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 d3362982da89eb058bdbeb56dd7b2ae83297114c Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Mon, 8 Jul 2024 19:32:00 +0000 Subject: [PATCH 2/2] fixup! chore: upgrade Go to 1.22.5 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9154d56b62dc7..6e1aa4a5ffe51 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,7 @@ name = "coder-${osArch}"; # Updated with ./scripts/update-flake.sh`. # This should be updated whenever go.mod changes! - vendorHash = "sha256-t5t37V0Dq4I5zq2Hj8vdUneTnXfwTRwr8CC7/IW4CgI="; + vendorHash = "sha256-HXDei93ALEImIMgX3Ez829jmJJsf46GwaqPDlleQFmk="; proxyVendor = true; src = ./.; nativeBuildInputs = with pkgs; [ getopt openssl zstd ];