From 7599550805b9aeb2f5411d83aff3cea6e0c8a727 Mon Sep 17 00:00:00 2001
From: Nicolas Duchon <nicolas.duchon@gmail.com>
Date: Sat, 3 Dec 2022 19:27:05 +0100
Subject: [PATCH 1/2] ci: fix integration test with Boulder

---
 test/setup/setup-boulder.sh | 2 +-
 test/setup/setup-local.sh   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/setup/setup-boulder.sh b/test/setup/setup-boulder.sh
index 20e0f45..7c2a539 100755
--- a/test/setup/setup-boulder.sh
+++ b/test/setup/setup-boulder.sh
@@ -10,7 +10,7 @@ setup_boulder() {
     && git clone https://github.com/letsencrypt/boulder \
       "$GOPATH/src/github.com/letsencrypt/boulder"
   pushd "$GOPATH/src/github.com/letsencrypt/boulder"
-  git checkout release-2020-12-14
+  git checkout release-2022-11-29
   if [[ "$(uname)" == 'Darwin' ]]; then
     # Set Standard Ports
     for file in test/config/va.json test/config/va-remote-a.json test/config/va-remote-b.json; do
diff --git a/test/setup/setup-local.sh b/test/setup/setup-local.sh
index 5bd13d4..7703d1e 100755
--- a/test/setup/setup-local.sh
+++ b/test/setup/setup-local.sh
@@ -128,9 +128,11 @@ EOF
 
     if [[ "$ACME_CA" == 'boulder' ]]; then
       # Stop and remove boulder
+      docker stop boulder
       docker-compose --project-name 'boulder' \
         --file "${GITHUB_WORKSPACE}/go/src/github.com/letsencrypt/boulder/docker-compose.yml" \
         down --volumes
+      docker rm boulder
     elif [[ "$ACME_CA" == 'pebble' ]]; then
       docker network rm acme_net
       [[ -f "${GITHUB_WORKSPACE}/pebble.minica.pem" ]] && rm "${GITHUB_WORKSPACE}/pebble.minica.pem"

From e320cc603bd8269d61f96047b680e9c732e6ec96 Mon Sep 17 00:00:00 2001
From: Nicolas Duchon <nicolas.duchon@gmail.com>
Date: Sat, 3 Dec 2022 19:33:11 +0100
Subject: [PATCH 2/2] ci: use actions/checkout@v3

---
 .github/workflows/dockerhub.yml | 2 +-
 .github/workflows/test.yml      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index e83db47..5d62246 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5692108..6ac88b3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build Image
         run: docker build -t "$IMAGE" .
@@ -52,7 +52,7 @@ jobs:
 
     steps:
       - name: Checkout Docker official images tests
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: docker-library/official-images
           path: official-images
@@ -108,7 +108,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # PREPARE RUNNER ENV
       - name: Add Test Domains in /etc/hosts