Merge branch 'main' into fix-va-config-panic

letsencrypt · Nov 9, 2023 · 40651bf · 40651bf
2 parents 35b67ad + 1bb8ef6
commit 40651bf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/boulder-ci.yml b/.github/workflows/boulder-ci.yml
@@ -36,8 +36,7 @@ jobs:
       matrix:
         # Add additional docker image tags here and all tests will be run with the additional image.
         BOULDER_TOOLS_TAG:
-          - go1.21.1_2023-09-07
-          - go1.21.3_2023-10-12
+          - go1.21.4_2023-11-09
         # 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.
@@ -104,7 +103,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.3' ]
+        go-version: [ '1.21.4' ]
 
     steps:
       # Checks out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -126,7 +125,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.3' ]
+        go-version: [ '1.21.4' ]
 
     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
@@ -15,8 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         GO_VERSION:
-          - "1.21.1"
-          - "1.21.3"
+          - "1.21.4"
     runs-on: ubuntu-20.04
     permissions:
       contents: write

diff --git a/.github/workflows/try-release.yml b/.github/workflows/try-release.yml
@@ -15,8 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         GO_VERSION:
-          - "1.21.1"
-          - "1.21.3"
+          - "1.21.4"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4

diff --git 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.3_2023-10-12}
+    image: letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.21.4_2023-11-09}
     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
@@ -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.1" "1.21.3" )
+GO_CI_VERSIONS=( "1.21.4" )
 # 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.3" )
+GO_DEV_VERSIONS=( "1.21.4" )
 
 echo "Please login to allow push to DockerHub"
 docker login