From 83eb20c980663712d6b47b99a12c19e51f2c2544 Mon Sep 17 00:00:00 2001
From: Madhava Jay <me@madhavajay.com>
Date: Fri, 8 Jul 2022 14:36:44 +1000
Subject: [PATCH] Trying fixed docker cache filter

---
 .github/workflows/stack-integration_tests.yml | 52 ++++++++++++++-----
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/stack-integration_tests.yml b/.github/workflows/stack-integration_tests.yml
index cc0d3859194..a05baa23d3d 100644
--- a/.github/workflows/stack-integration_tests.yml
+++ b/.github/workflows/stack-integration_tests.yml
@@ -361,15 +361,27 @@ jobs:
         run: |
           pip install tox --upgrade
 
-      - name: docker cache
-        uses: actions/cache@v3
-        if: steps.changes.outputs.stack == 'true'
-        continue-on-error: true
+      # - name: docker cache
+      #   uses: actions/cache@v3
+      #   if: steps.changes.outputs.stack == 'true'
+      #   continue-on-error: true
+      #   with:
+      #     path: .docker-cache
+      #     key: ${{ runner.os }}-docker
+      #     restore-keys: |
+      #       ${{ runner.os }}-docker
+
+      - name: Cache openmined images
+        uses: broadshield/action-docker-layer-caching@main
         with:
-          path: .docker-cache
-          key: ${{ runner.os }}-docker
+          filter: reference="*/openmined*:*"
+          key: docker-layer-caching-${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ github.event_name }}-{hash}
           restore-keys: |
-            ${{ runner.os }}-docker
+            docker-layer-caching-${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ github.event_name }}-{hash}
+            docker-layer-caching-${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ github.event_name }}
+            docker-layer-caching-${{ github.workflow }}-${{ github.head_ref || github.ref }}
+            docker-layer-caching-${{ github.workflow }}
+            docker-layer-caching-
 
       - name: Run integration tests
         if: steps.changes.outputs.stack == 'true'
@@ -543,15 +555,27 @@ jobs:
         run: |
           pip install tox --upgrade
 
-      - name: docker cache
-        uses: actions/cache@v3
-        if: steps.changes.outputs.stack == 'true'
-        continue-on-error: true
+      # - name: docker cache
+      #   uses: actions/cache@v3
+      #   if: steps.changes.outputs.stack == 'true'
+      #   continue-on-error: true
+      #   with:
+      #     path: .docker-cache
+      #     key: ${{ runner.os }}-docker
+      #     restore-keys: |
+      #       ${{ runner.os }}-docker
+
+      - name: Cache openmined images
+        uses: broadshield/action-docker-layer-caching@main
         with:
-          path: .docker-cache
-          key: ${{ runner.os }}-docker
+          filter: reference="*/openmined*:*"
+          key: docker-layer-caching-${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ github.event_name }}-{hash}
           restore-keys: |
-            ${{ runner.os }}-docker
+            docker-layer-caching-${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ github.event_name }}-{hash}
+            docker-layer-caching-${{ github.workflow }}-${{ github.head_ref || github.ref }}-${{ github.event_name }}
+            docker-layer-caching-${{ github.workflow }}-${{ github.head_ref || github.ref }}
+            docker-layer-caching-${{ github.workflow }}
+            docker-layer-caching-
 
       - name: Run integration tests
         if: steps.changes.outputs.stack == 'true'