Skip to content

Commit 73efe13

Browse files
chore: refine CI Docker cache (#445)
1 parent 7e88f29 commit 73efe13

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

.github/workflows/cd.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ jobs:
6666
compose.yaml
6767
compose.prod.yaml
6868
set: |
69-
php.cache-from=type=gha,scope=${{ github.ref }}
70-
php.cache-from=type=gha,scope=refs/heads/main
71-
php.cache-to=type=gha,scope=${{ github.ref }},mode=max
72-
pwa.cache-from=type=gha,scope=${{ github.ref }}
73-
pwa.cache-from=type=gha,scope=refs/heads/main
74-
pwa.cache-to=type=gha,scope=${{ github.ref }},mode=max
75-
keycloak.cache-from=type=gha,scope=${{ github.ref }}
76-
keycloak.cache-from=type=gha,scope=refs/heads/main
77-
keycloak.cache-to=type=gha,scope=${{ github.ref }},mode=max
69+
php.cache-from=type=gha,scope=php-${{ github.ref }}
70+
php.cache-from=type=gha,scope=php-refs/heads/main
71+
php.cache-to=type=gha,scope=php-${{ github.ref }},mode=max
72+
pwa.cache-from=type=gha,scope=pwa-${{ github.ref }}
73+
pwa.cache-from=type=gha,scope=pwa-refs/heads/main
74+
pwa.cache-to=type=gha,scope=pwa-${{ github.ref }},mode=max
75+
keycloak.cache-from=type=gha,scope=keycloak-${{ github.ref }}
76+
keycloak.cache-from=type=gha,scope=keycloak-refs/heads/main
77+
keycloak.cache-to=type=gha,scope=keycloak-${{ github.ref }},mode=max
7878
-
7979
name: Docker push
8080
run: |

.github/workflows/ci.yml

+21-21
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ jobs:
3939
compose.yaml
4040
compose.override.yaml
4141
set: |
42-
php.cache-from=type=gha,scope=${{ github.ref }}
43-
php.cache-from=type=gha,scope=refs/heads/main
44-
php.cache-to=type=gha,scope=${{ github.ref }},mode=max
45-
pwa.cache-from=type=gha,scope=${{ github.ref }}
46-
pwa.cache-from=type=gha,scope=refs/heads/main
47-
pwa.cache-to=type=gha,scope=${{ github.ref }},mode=max
48-
keycloak.cache-from=type=gha,scope=${{ github.ref }}
49-
keycloak.cache-from=type=gha,scope=refs/heads/main
50-
keycloak.cache-to=type=gha,scope=${{ github.ref }},mode=max
42+
php.cache-from=type=gha,scope=php-${{ github.ref }}
43+
php.cache-from=type=gha,scope=php-refs/heads/main
44+
php.cache-to=type=gha,scope=php-${{ github.ref }},mode=max
45+
pwa.cache-from=type=gha,scope=pwa-${{ github.ref }}
46+
pwa.cache-from=type=gha,scope=pwa-refs/heads/main
47+
pwa.cache-to=type=gha,scope=pwa-${{ github.ref }},mode=max
48+
keycloak.cache-from=type=gha,scope=keycloak-${{ github.ref }}
49+
keycloak.cache-from=type=gha,scope=keycloak-refs/heads/main
50+
keycloak.cache-to=type=gha,scope=keycloak-${{ github.ref }},mode=max
5151
-
5252
name: Start services
5353
run: docker compose up --wait --no-build
@@ -136,18 +136,18 @@ jobs:
136136
compose.yaml
137137
compose.prod.yaml
138138
set: |
139-
php.cache-from=type=gha,scope=${{ github.ref }}-e2e
140-
php.cache-from=type=gha,scope=${{ github.ref }}
141-
php.cache-from=type=gha,scope=refs/heads/main
142-
php.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
143-
pwa.cache-from=type=gha,scope=${{ github.ref }}-e2e
144-
pwa.cache-from=type=gha,scope=${{ github.ref }}
145-
pwa.cache-from=type=gha,scope=refs/heads/main
146-
pwa.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
147-
keycloak.cache-from=type=gha,scope=${{ github.ref }}-e2e
148-
keycloak.cache-from=type=gha,scope=${{ github.ref }}
149-
keycloak.cache-from=type=gha,scope=refs/heads/main
150-
keycloak.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
139+
php.cache-from=type=gha,scope=php-${{ github.ref }}-e2e
140+
php.cache-from=type=gha,scope=php-${{ github.ref }}
141+
php.cache-from=type=gha,scope=php-refs/heads/main
142+
php.cache-to=type=gha,scope=php-${{ github.ref }}-e2e,mode=max
143+
pwa.cache-from=type=gha,scope=pwa-${{ github.ref }}-e2e
144+
pwa.cache-from=type=gha,scope=pwa-${{ github.ref }}
145+
pwa.cache-from=type=gha,scope=pwa-refs/heads/main
146+
pwa.cache-to=type=gha,scope=pwa-${{ github.ref }}-e2e,mode=max
147+
keycloak.cache-from=type=gha,scope=keycloak-${{ github.ref }}-e2e
148+
keycloak.cache-from=type=gha,scope=keycloak-${{ github.ref }}
149+
keycloak.cache-from=type=gha,scope=keycloak-refs/heads/main
150+
keycloak.cache-to=type=gha,scope=keycloak-${{ github.ref }}-e2e,mode=max
151151
-
152152
name: Start Services
153153
run: docker compose up --wait --no-build

0 commit comments

Comments
 (0)