From 8cd8f9cc1e7441ce77dd6c7bc07eddfcd99c3ff1 Mon Sep 17 00:00:00 2001
From: Chongyi Zheng <harryzheng25@gmail.com>
Date: Thu, 10 Aug 2023 01:11:37 -0500
Subject: [PATCH] Upgrade Go to 1.21 (#143)

---
 .github/workflows/lint.yaml | 2 +-
 .github/workflows/test.yaml | 4 ++--
 Dockerfile                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index c191eee..1901739 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: golangci/golangci-lint-action@v3.4.0
         with:
           version: v1.52.2
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4d6052b..9a8b0ac 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: '1.20'
+        go-version: '1.21'
 
     - uses: actions/checkout@v2
 
@@ -43,8 +43,8 @@ jobs:
     strategy:
       matrix:
         go_version:
+        - '1.20'
         - '1.19'
-        - '1.18'
 
     steps:
     - uses: actions/setup-go@v2
diff --git a/Dockerfile b/Dockerfile
index 967986e..141a049 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.3
-FROM golang:1.20 AS build
+FROM golang:1.21 AS build
 
 WORKDIR /go/src/github.com/mccutchen/go-httpbin
 
-- 
GitLab