From e9be43b2f028e3411b36d0ba87067de11003a355 Mon Sep 17 00:00:00 2001
From: Alec Thomas <aat@tbd.email>
Date: Tue, 20 Aug 2024 02:46:14 +1000
Subject: [PATCH] chore: upgrade to go-1.23.0 (#2430)

This also required upgrading golangci-lint due to
https://github.com/golangci/golangci-lint/issues/4909
---
 .github/workflows/ci.yml                                     | 4 +++-
 bin/{.go-1.22.6.pkg => .go-1.23.0.pkg}                       | 0
 bin/{.golangci-lint-1.59.1.pkg => .golangci-lint-1.60.1.pkg} | 0
 bin/go                                                       | 2 +-
 bin/gofmt                                                    | 2 +-
 bin/golangci-lint                                            | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename bin/{.go-1.22.6.pkg => .go-1.23.0.pkg} (100%)
 rename bin/{.golangci-lint-1.59.1.pkg => .golangci-lint-1.60.1.pkg} (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 052685db53..5ea3c1cda8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,7 +88,9 @@ jobs:
       - name: Build Cache
         uses: ./.github/actions/build-cache
       - name: golangci-lint
-        run: golangci-lint run --new-from-rev="$(git merge-base origin/main HEAD)" --out-format github-actions ./...
+        run: |
+          golangci-lint --version
+          golangci-lint run --new-from-rev="$(git merge-base origin/main HEAD)" --out-format github-actions ./...
       - name: lint-commit-or-rollback
         run: lint-commit-or-rollback ./backend/... 2>&1 | to-annotation
       - name: go-check-sumtype
diff --git a/bin/.go-1.22.6.pkg b/bin/.go-1.23.0.pkg
similarity index 100%
rename from bin/.go-1.22.6.pkg
rename to bin/.go-1.23.0.pkg
diff --git a/bin/.golangci-lint-1.59.1.pkg b/bin/.golangci-lint-1.60.1.pkg
similarity index 100%
rename from bin/.golangci-lint-1.59.1.pkg
rename to bin/.golangci-lint-1.60.1.pkg
diff --git a/bin/go b/bin/go
index fec23e291d..46022546bb 120000
--- a/bin/go
+++ b/bin/go
@@ -1 +1 @@
-.go-1.22.6.pkg
\ No newline at end of file
+.go-1.23.0.pkg
\ No newline at end of file
diff --git a/bin/gofmt b/bin/gofmt
index fec23e291d..46022546bb 120000
--- a/bin/gofmt
+++ b/bin/gofmt
@@ -1 +1 @@
-.go-1.22.6.pkg
\ No newline at end of file
+.go-1.23.0.pkg
\ No newline at end of file
diff --git a/bin/golangci-lint b/bin/golangci-lint
index 99e329692a..48577165e3 120000
--- a/bin/golangci-lint
+++ b/bin/golangci-lint
@@ -1 +1 @@
-.golangci-lint-1.59.1.pkg
\ No newline at end of file
+.golangci-lint-1.60.1.pkg
\ No newline at end of file