try separate caches scope

keephq · Dec 10, 2024 · 7fb0745 · 7fb0745
1 parent 0d93811
commit 7fb0745
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/test-pr-e2e.yml b/.github/workflows/test-pr-e2e.yml
@@ -81,9 +81,6 @@ jobs:
           files: |
             tests/e2e_tests/docker-compose-e2e-${{ matrix.db_type }}.yml
           load: true
-          set: |
-            *.cache-from=type=gha
-            *.cache-to=type=gha,mode=max
 
       - name: Set up Keep environment
         run: |

diff --git a/tests/e2e_tests/docker-compose-e2e-mysql.yml b/tests/e2e_tests/docker-compose-e2e-mysql.yml
@@ -22,13 +22,16 @@ services:
     build:
       context: ./keep-ui/
       dockerfile: ../docker/Dockerfile.ui
+    x-bake:
+      cache-from:
+        - type=gha,scope=frontend
+      cache-to:
+        - type=gha,mode=max,scope=frontend
     environment:
       - AUTH_TYPE=NO_AUTH
       - API_URL=http://keep-backend:8080
       - POSTHOG_DISABLED=true
       - SENTRY_DISABLED=true
-    x-bake:
-      depends_on: ["keep-backend"]
 
   keep-backend:
     extends:
@@ -37,6 +40,11 @@ services:
     build:
       context: .
       dockerfile: docker/Dockerfile.api
+    x-bake:
+      cache-from:
+        - type=gha,scope=backend
+      cache-to:
+        - type=gha,mode=max,scope=backend
     environment:
       - AUTH_TYPE=NO_AUTH
       - DATABASE_CONNECTION_STRING=mysql+pymysql://root:keep@keep-database:3306/keep

diff --git a/tests/e2e_tests/docker-compose-e2e-postgres.yml b/tests/e2e_tests/docker-compose-e2e-postgres.yml
@@ -20,6 +20,11 @@ services:
     build:
       context: ./keep-ui/
       dockerfile: ../docker/Dockerfile.ui
+    x-bake:
+      cache-from:
+        - type=gha,scope=frontend
+      cache-to:
+        - type=gha,mode=max,scope=frontend
     environment:
       - AUTH_TYPE=NO_AUTH
       - API_URL=http://keep-backend:8080
@@ -33,6 +38,11 @@ services:
     build:
       context: .
       dockerfile: docker/Dockerfile.api
+    x-bake:
+      cache-from:
+        - type=gha,scope=backend
+      cache-to:
+        - type=gha,mode=max,scope=backend
     environment:
       - AUTH_TYPE=NO_AUTH
       - DATABASE_CONNECTION_STRING=postgresql://keepuser:keeppassword@keep-database:5432/keepdb