From c45bfb8aedfc4c0c83270db5dbdf029b472c196b Mon Sep 17 00:00:00 2001
From: Aaron Gable <aaron@letsencrypt.org>
Date: Tue, 5 Dec 2023 11:16:55 -0800
Subject: [PATCH] Begin testing on go1.21.5 (#7185)

---
 .github/workflows/boulder-ci.yml     | 7 ++++---
 .github/workflows/release.yml        | 1 +
 .github/workflows/try-release.yml    | 1 +
 docker-compose.yml                   | 2 +-
 test/boulder-tools/tag_and_upload.sh | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/boulder-ci.yml b/.github/workflows/boulder-ci.yml
index 36622492015..05287880c3e 100644
--- a/.github/workflows/boulder-ci.yml
+++ b/.github/workflows/boulder-ci.yml
@@ -36,7 +36,8 @@ jobs:
       matrix:
         # Add additional docker image tags here and all tests will be run with the additional image.
         BOULDER_TOOLS_TAG:
-          - go1.21.4_2023-11-09
+          - go1.21.4_2023-12-05
+          - go1.21.5_2023-12-05
         # Tests command definitions. Use the entire "docker compose" command you want to run.
         tests:
           # Run ./test.sh --help for a description of each of the flags.
@@ -103,7 +104,7 @@ jobs:
       # When set to true, GitHub cancels all in-progress jobs if any matrix job fails. Default: true
       fail-fast: false
       matrix:
-        go-version: [ '1.21.4' ]
+        go-version: [ '1.21.5' ]
 
     steps:
       # Checks out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -125,7 +126,7 @@ jobs:
       # When set to true, GitHub cancels all in-progress jobs if any matrix job fails. Default: true
       fail-fast: false
       matrix:
-        go-version: [ '1.21.4' ]
+        go-version: [ '1.21.5' ]
 
     steps:
       # Checks out your repository under $GITHUB_WORKSPACE, so your job can access it
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5f3ba578a01..79b50aca9d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,7 @@ jobs:
       matrix:
         GO_VERSION:
           - "1.21.4"
+          - "1.21.5"
     runs-on: ubuntu-20.04
     permissions:
       contents: write
diff --git a/.github/workflows/try-release.yml b/.github/workflows/try-release.yml
index b8bf1cdb999..bbb9b31bd1a 100644
--- a/.github/workflows/try-release.yml
+++ b/.github/workflows/try-release.yml
@@ -16,6 +16,7 @@ jobs:
       matrix:
         GO_VERSION:
           - "1.21.4"
+          - "1.21.5"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
diff --git a/docker-compose.yml b/docker-compose.yml
index f6473c8ef28..561570255fd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   boulder:
     # Should match one of the GO_DEV_VERSIONS in test/boulder-tools/tag_and_upload.sh.
-    image: letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.21.4_2023-11-09}
+    image: letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.21.5_2023-12-05}
     environment:
       # To solve HTTP-01 and TLS-ALPN-01 challenges, change the IP in FAKE_DNS
       # to the IP address where your ACME client's solver is listening.
diff --git a/test/boulder-tools/tag_and_upload.sh b/test/boulder-tools/tag_and_upload.sh
index cced6f889e0..e66fe78ab05 100755
--- a/test/boulder-tools/tag_and_upload.sh
+++ b/test/boulder-tools/tag_and_upload.sh
@@ -12,11 +12,11 @@ DOCKER_REPO="letsencrypt/boulder-tools"
 # .github/workflows/release.yml,
 # .github/workflows/try-release.yml if appropriate,
 # and .github/workflows/boulder-ci.yml with the new container tag.
-GO_CI_VERSIONS=( "1.21.4" )
+GO_CI_VERSIONS=( "1.21.4" "1.21.5" )
 # These versions are built for both platforms that boulder devs use.
 # When updating GO_DEV_VERSIONS, please also update
 # ../../docker-compose.yml's default Go version.
-GO_DEV_VERSIONS=( "1.21.4" )
+GO_DEV_VERSIONS=( "1.21.5" )
 
 echo "Please login to allow push to DockerHub"
 docker login