From da73fe3ac6c40022ce03073fa30f856f27e05436 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 21 Jun 2024 08:19:54 +0100 Subject: [PATCH 1/7] chore: update Go version to 1.22.4 --- dogfood/Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile index 27f90a5752eaa..8bfdb4d2bdb0b 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.3 +ARG GO_VERSION=1.22.4 RUN mkdir --parents /usr/local/go # Boring Go is needed to build FIPS-compliant binaries. diff --git a/go.mod b/go.mod index 037385d6d22b4..cf2733c161c3a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/coder/coder/v2 -go 1.22.3 +go 1.22.4 // 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 78900be4f6095182b04d6609f6c54a589f1d743d Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 21 Jun 2024 10:06:43 +0200 Subject: [PATCH 2/7] update flake --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2b6f032ade30d..92fd6e3512e4b 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-BVgjKZeVogPb/kyCtZw/R898TI4YGnu9oWzzxHSVIyY="; + vendorHash = "sha256-wR/8olH5H5wNVzMCNiGkTo5qvjCFSme1pt+N84O7glY="; proxyVendor = true; src = ./.; nativeBuildInputs = with pkgs; [ getopt openssl zstd ]; From f7f4a48ad781930677024945fb95029904e36711 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 21 Jun 2024 09:26:33 +0100 Subject: [PATCH 3/7] update flake on amd64 instead --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 92fd6e3512e4b..c2f668b6b6445 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-wR/8olH5H5wNVzMCNiGkTo5qvjCFSme1pt+N84O7glY="; + vendorHash = "sha256-MCI3NHbiPA7Ow5AIhGvBvYL6xC328cxec6X2P62Wupc="; proxyVendor = true; src = ./.; nativeBuildInputs = with pkgs; [ getopt openssl zstd ]; From 56d3ebc03ea8262196f7150d9d9979e82b0ee859 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 24 Jun 2024 09:12:33 +0100 Subject: [PATCH 4/7] try updating hash again --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index c2f668b6b6445..cd68bb01b0402 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-MCI3NHbiPA7Ow5AIhGvBvYL6xC328cxec6X2P62Wupc="; + vendorHash = "sha256-N+aZqy4GFqY9I+DONbcehcWUX8S0aUuyzsS61RsnQSQ="; proxyVendor = true; src = ./.; nativeBuildInputs = with pkgs; [ getopt openssl zstd ]; From ccf87e4b030baac78e625e7284fd52e22d5b11fc Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 24 Jun 2024 11:16:36 +0100 Subject: [PATCH 5/7] update go version in setup-go action --- .github/actions/setup-go/action.yaml | 2 +- .github/workflows/ci.yaml | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/actions/setup-go/action.yaml b/.github/actions/setup-go/action.yaml index c53ce28c3c591..be65c2add8c2f 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.3" + default: "1.22.4" runs: using: "composite" steps: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 739948be55b25..3b130012adfa3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -254,12 +254,9 @@ jobs: - name: Setup Node uses: ./.github/actions/setup-node + # Use default Go version - name: Setup Go - uses: buildjet/setup-go@v5 - with: - # This doesn't need caching. It's super fast anyways! - cache: false - go-version: 1.21.9 + uses: ./.github/actions/setup-go - name: Install shfmt run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0 From 19e34829a0f73c829d03e3f8f14702688a7381ea Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 24 Jun 2024 13:59:34 +0100 Subject: [PATCH 6/7] nix flake update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c6853aa477736..2d9e9b4cf4cd5 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715087517, - "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { From 6ae13cf7047eff66337bb9a7b4bf0a421ba1f281 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Mon, 24 Jun 2024 16:49:16 +0300 Subject: [PATCH 7/7] `./scripts/update-flake.sh` I ran it on my amd64 desktop in a WSL shell on Widows 11. --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index cd68bb01b0402..ca31783e36045 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-N+aZqy4GFqY9I+DONbcehcWUX8S0aUuyzsS61RsnQSQ="; + vendorHash = "sha256-+K95kbYNMKiYk7obN2gjNCtBvaXBWPLKm12N6cF9ImQ="; proxyVendor = true; src = ./.; nativeBuildInputs = with pkgs; [ getopt openssl zstd ];