From e874c166654f6bab02a90aa6b8c08f4ab8acd7dd Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 15 May 2024 20:06:54 +0000
Subject: [PATCH 1/4] pattern fix

---
 .github/ensure-tester-with-images/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ensure-tester-with-images/action.yml b/.github/ensure-tester-with-images/action.yml
index 52bb975d223..5f4508d7f10 100644
--- a/.github/ensure-tester-with-images/action.yml
+++ b/.github/ensure-tester-with-images/action.yml
@@ -64,7 +64,7 @@ runs:
 
             sudo flock /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.lock bash -c '
               if ! [ -f /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli ] ; then
-                docker save aztecprotocol/aztec:${{ env.IMAGE_KEY }} aztecprotocol/end-to-end:${{ env.IMAGE_KEY }} | brotli -2 > /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp
+                ${{ input.builder_images_to_copy }} | brotli -2 > /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp
                 mv /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli
               fi'
             sudo cat /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli

From d1171e135abcfb33c2463939560b464811b832f0 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 15 May 2024 20:09:13 +0000
Subject: [PATCH 2/4] fix

---
 .github/ensure-tester-with-images/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ensure-tester-with-images/action.yml b/.github/ensure-tester-with-images/action.yml
index 5f4508d7f10..954e90ae496 100644
--- a/.github/ensure-tester-with-images/action.yml
+++ b/.github/ensure-tester-with-images/action.yml
@@ -41,9 +41,9 @@ runs:
             docker images --no-trunc --quiet \$image
           done" > .success_key
         # TODO better image key
-        echo "IMAGE_KEY=$(git rev-parse HEAD)" >> $GITHUB_ENV
+        echo "IMAGE_KEY=$(cat .success_key | md5sum | awk '{print $1}')-$(git rev-parse HEAD)" >> $GITHUB_ENV
         echo "${{ inputs.run }}" >> .success_key
-        echo "SUCCESS_KEY=$(cat .success_key | md5sum | awk '{print $1}') " >> $GITHUB_ENV
+        echo "SUCCESS_KEY=$(cat .success_key | md5sum | awk '{print $1}')" >> $GITHUB_ENV
 
     - name: Check Cached Success
       uses: ./.github/cache-success

From 8f7ea975eb50c22296fd0a4026bb46a33ae90a81 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 15 May 2024 16:13:19 -0400
Subject: [PATCH 3/4] Update action.yml

---
 .github/ensure-tester-with-images/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ensure-tester-with-images/action.yml b/.github/ensure-tester-with-images/action.yml
index 954e90ae496..66f00a3c786 100644
--- a/.github/ensure-tester-with-images/action.yml
+++ b/.github/ensure-tester-with-images/action.yml
@@ -64,7 +64,7 @@ runs:
 
             sudo flock /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.lock bash -c '
               if ! [ -f /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli ] ; then
-                ${{ input.builder_images_to_copy }} | brotli -2 > /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp
+                ${{ inputs.builder_images_to_copy }} | brotli -2 > /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp
                 mv /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli
               fi'
             sudo cat /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli
@@ -74,4 +74,4 @@ runs:
       uses: ./.github/run-on-tester
       if: ${{ env.CACHE_SUCCESS != 'true' }}
       with:
-        run: ${{ inputs.run }}
\ No newline at end of file
+        run: ${{ inputs.run }}

From 4051683d4fba7999e65c286be499d1b0d4107be5 Mon Sep 17 00:00:00 2001
From: Tom French <15848336+TomAFrench@users.noreply.github.com>
Date: Wed, 15 May 2024 22:07:30 +0100
Subject: [PATCH 4/4] Update .github/ensure-tester-with-images/action.yml

---
 .github/ensure-tester-with-images/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ensure-tester-with-images/action.yml b/.github/ensure-tester-with-images/action.yml
index 66f00a3c786..f3f313988f1 100644
--- a/.github/ensure-tester-with-images/action.yml
+++ b/.github/ensure-tester-with-images/action.yml
@@ -64,7 +64,7 @@ runs:
 
             sudo flock /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.lock bash -c '
               if ! [ -f /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli ] ; then
-                ${{ inputs.builder_images_to_copy }} | brotli -2 > /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp
+                docker save ${{ inputs.builder_images_to_copy }} | brotli -2 > /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp
                 mv /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli.tmp /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli
               fi'
             sudo cat /var/lib/docker/tmp-images/${{ env.IMAGE_KEY }}.brotli