From d08eeee94da15ffa84c5e16e757c2288a860462e Mon Sep 17 00:00:00 2001
From: Neil Twigg <neil@nats.io>
Date: Thu, 31 Aug 2023 09:00:29 +0100
Subject: [PATCH] Use Go 1.21 for nightlies, Dockerfile, code coverage, bump
 `go.mod` version to Go 1.20

Signed-off-by: Neil Twigg <neil@nats.io>
---
 .github/workflows/cov.yaml        | 2 +-
 .github/workflows/go-test.yaml    | 2 +-
 .github/workflows/nightly.yaml    | 2 +-
 .github/workflows/rc_nightly.yaml | 2 +-
 .travis.yml                       | 8 ++++----
 docker/Dockerfile.nightly         | 2 +-
 go.mod                            | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/cov.yaml b/.github/workflows/cov.yaml
index b0684a56..ccc10282 100644
--- a/.github/workflows/cov.yaml
+++ b/.github/workflows/cov.yaml
@@ -23,7 +23,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20.x"
+          go-version: "1.21.x"
 
       - name: Run code coverage
         shell: bash --noprofile --norc -x -eo pipefail {0}
diff --git a/.github/workflows/go-test.yaml b/.github/workflows/go-test.yaml
index dd8634f5..def55c5f 100644
--- a/.github/workflows/go-test.yaml
+++ b/.github/workflows/go-test.yaml
@@ -5,7 +5,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go: ["1.20"]
+        go: ["1.21"]
 
     env:
       GOPATH: /home/runner/work/nats-server
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 8f2462eb..b5189548 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: ./src/github.com/nats-io/nats-server/.github/actions/nightly-release
         with:
-          go: "1.20"
+          go: "1.21"
           workdir: src/github.com/nats-io/nats-server
           label: nightly
           hub_username: "${{ secrets.DOCKER_USERNAME }}"
diff --git a/.github/workflows/rc_nightly.yaml b/.github/workflows/rc_nightly.yaml
index f6cf6bc7..7597ca1d 100644
--- a/.github/workflows/rc_nightly.yaml
+++ b/.github/workflows/rc_nightly.yaml
@@ -22,7 +22,7 @@ jobs:
 
       - uses: ./src/github.com/nats-io/nats-server/.github/actions/nightly-release
         with:
-          go: "1.20"
+          go: "1.21"
           workdir: src/github.com/nats-io/nats-server
           label: nightly-main
           hub_username: "${{ secrets.DOCKER_USERNAME }}"
diff --git a/.travis.yml b/.travis.yml
index 3523cd1d..f6ef5a70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ vm:
 
 language: go
 go:
-# This should be quoted or use .x, but should not be unquoted.
-# Remember that a YAML bare float drops trailing zeroes.
+  # This should be quoted or use .x, but should not be unquoted.
+  # Remember that a YAML bare float drops trailing zeroes.
   - "1.21.x"
   - "1.20.x"
 
@@ -41,7 +41,7 @@ jobs:
     - name: "Run all tests from all other packages"
       env: TEST_SUITE=non_srv_pkg_tests
     - name: "Compile with older Go release"
-      go: "1.19.12"
+      go: "1.20"
       env: TEST_SUITE=build_only
 
 script: ./scripts/runTestsOnTravis.sh $TEST_SUITE
@@ -52,4 +52,4 @@ deploy:
   script: curl -sL http://git.io/goreleaser | bash
   on:
     tags: true
-    condition: ($TRAVIS_GO_VERSION =~ 1.20) && ($TEST_SUITE = "compile")
+    condition: ($TRAVIS_GO_VERSION =~ 1.21) && ($TEST_SUITE = "compile")
diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly
index aa2ade34..dbb2c093 100644
--- a/docker/Dockerfile.nightly
+++ b/docker/Dockerfile.nightly
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine AS builder
+FROM golang:1.21-alpine AS builder
 
 ARG VERSION="nightly"
 
diff --git a/go.mod b/go.mod
index 52473475..3d919146 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/nats-io/nats-server/v2
 
-go 1.19
+go 1.20
 
 require (
 	github.com/klauspost/compress v1.16.7