From 724a75872b3fd2e1c44e79f224332812915d3bb9 Mon Sep 17 00:00:00 2001
From: Adin Schmahmann <adin.schmahmann@gmail.com>
Date: Mon, 18 Sep 2023 09:40:43 -0400
Subject: [PATCH] chore: update to build with Go 1.21

---
 .github/workflows/build.yml               | 2 +-
 .github/workflows/docker-build.yml        | 2 +-
 .github/workflows/gateway-conformance.yml | 2 +-
 .github/workflows/gobuild.yml             | 2 +-
 .github/workflows/golang-analysis.yml     | 2 +-
 .github/workflows/golint.yml              | 2 +-
 .github/workflows/gotest.yml              | 2 +-
 .github/workflows/sharness.yml            | 2 +-
 Dockerfile                                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7222876d0bb..49ac96690f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
       - 'master'
 
 env:
-  GO_VERSION: 1.20.x
+  GO_VERSION: 1.21.x
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name == 'push' && github.sha || github.ref }}
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index b0f607bcaab..d05429a6c42 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: actions/checkout@v4
       - run: docker build -t $IMAGE_NAME:$WIP_IMAGE_TAG .
       - run: docker run --rm $IMAGE_NAME:$WIP_IMAGE_TAG --version
diff --git a/.github/workflows/gateway-conformance.yml b/.github/workflows/gateway-conformance.yml
index bfb6c3d96f2..33727bd3464 100644
--- a/.github/workflows/gateway-conformance.yml
+++ b/.github/workflows/gateway-conformance.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Checkout kubo-gateway
         uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/gobuild.yml b/.github/workflows/gobuild.yml
index d8854b3b62b..13eabc0fcad 100644
--- a/.github/workflows/gobuild.yml
+++ b/.github/workflows/gobuild.yml
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: actions/checkout@v4
       - run: make cmd/ipfs-try-build
         env:
diff --git a/.github/workflows/golang-analysis.yml b/.github/workflows/golang-analysis.yml
index e87bdfff37d..eddaba988ec 100644
--- a/.github/workflows/golang-analysis.yml
+++ b/.github/workflows/golang-analysis.yml
@@ -27,7 +27,7 @@ jobs:
           submodules: recursive
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.20.x"
+          go-version: "1.21.x"
       - name: Check that go.mod is tidy
         uses: protocol/multiple-go-modules@v1.4
         with:
diff --git a/.github/workflows/golint.yml b/.github/workflows/golint.yml
index 602adc8b77a..d6191e6f376 100644
--- a/.github/workflows/golint.yml
+++ b/.github/workflows/golint.yml
@@ -31,6 +31,6 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - uses: actions/checkout@v4
       - run: make -O test_go_lint
diff --git a/.github/workflows/gotest.yml b/.github/workflows/gotest.yml
index cfd3abb0117..a1042cf7add 100644
--- a/.github/workflows/gotest.yml
+++ b/.github/workflows/gotest.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Check out Kubo
         uses: actions/checkout@v4
       - name: Install missing tools
diff --git a/.github/workflows/sharness.yml b/.github/workflows/sharness.yml
index 26b06dece16..448e112de8b 100644
--- a/.github/workflows/sharness.yml
+++ b/.github/workflows/sharness.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
       - name: Checkout Kubo
         uses: actions/checkout@v4
         with:
diff --git a/Dockerfile b/Dockerfile
index 348fbc44073..15dff4aea96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20 AS builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.21 AS builder
 
 ARG TARGETOS TARGETARCH