From fac33d6fa8ab1c23f30f4089c855e245abf4b7bd Mon Sep 17 00:00:00 2001
From: michalbiesek <michalbiesek@gmail.com>
Date: Sun, 20 Aug 2023 19:47:04 +0200
Subject: [PATCH] Add support for `Go 1.21` (#885)

* Add support for `Go 1.21`

Signed-off-by: Michal Biesek <michalbiesek@gmail.com>

* add go1.21 guard to fuzz_test.go

* ci: only build last two go versions

* fix workflow yaml syntax error

---------

Signed-off-by: Michal Biesek <michalbiesek@gmail.com>
Co-authored-by: Thomas Pelletier <thomas@pelletier.codes>
---
 .github/workflows/coverage.yml | 2 +-
 .github/workflows/release.yml  | 2 +-
 .github/workflows/workflow.yml | 4 ++--
 fuzz_test.go                   | 4 ++--
 ossfuzz/fuzz.go                | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 37607d70..505b8f7a 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -15,6 +15,6 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
       - name: Run tests with coverage
         run: ./ci.sh coverage -d "${GITHUB_BASE_REF-HEAD}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b5f9e96d..690e1d12 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 889a5b13..a8baf26c 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -11,8 +11,8 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest']
-        go: [ '1.19', '1.20' ]
+        os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest' ]
+        go: [ '1.20', '1.21' ]
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.go }}/${{ matrix.os }}
     steps:
diff --git a/fuzz_test.go b/fuzz_test.go
index da20a396..c340f83f 100644
--- a/fuzz_test.go
+++ b/fuzz_test.go
@@ -1,5 +1,5 @@
-//go:build go1.18 || go1.19 || go1.20
-// +build go1.18 go1.19 go1.20
+//go:build go1.18 || go1.19 || go1.20 || go1.21
+// +build go1.18 go1.19 go1.20 go1.21
 
 package toml_test
 
diff --git a/ossfuzz/fuzz.go b/ossfuzz/fuzz.go
index 34f6d5e0..1c26587f 100644
--- a/ossfuzz/fuzz.go
+++ b/ossfuzz/fuzz.go
@@ -1,5 +1,5 @@
-//go:build go1.18 || go1.19 || go1.20
-// +build go1.18 go1.19 go1.20
+//go:build go1.18 || go1.19 || go1.20 || go1.21
+// +build go1.18 go1.19 go1.20 go1.21
 
 package ossfuzz