Skip to content

Commit 78d1586

Browse files
committed
Separate caches for architecture, extract always
1 parent 970b5ed commit 78d1586

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

.github/workflows/ci-pipeline.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
path: |
4141
home-nonroot-cache-uv
42-
key: cache-uv-${{ hashFiles('uv.lock') }}
42+
key: cache-uv-linux-amd64-${{ hashFiles('uv.lock') }}
4343

4444
- name: APT Build Caches for Docker APT
4545
id: docker-build-apt-cache
@@ -48,7 +48,7 @@ jobs:
4848
path: |
4949
var-cache-apt
5050
var-lib-apt
51-
key: cache-apt-${{ hashFiles('Dockerfile') }}
51+
key: cache-apt-linux-amd64-${{ hashFiles('Dockerfile') }}
5252

5353
- name: Inject UV cache in docker
5454
uses: reproducible-containers/[email protected]
@@ -57,7 +57,6 @@ jobs:
5757
{
5858
"home-nonroot-cache-uv": "/home/nonroot/.cache/uv"
5959
}
60-
skip-extraction: ${{ steps.docker-build-uv-cache.outputs.cache-hit }}
6160
6261
- name: Inject APT cache in docker
6362
uses: reproducible-containers/[email protected]
@@ -67,7 +66,6 @@ jobs:
6766
"var-cache-apt": "/var/cache/apt",
6867
"var-lib-apt": "/var/lib/apt"
6968
}
70-
skip-extraction: ${{ steps.docker-build-apt-cache.outputs.cache-hit }}
7169
7270
# Build but don't push Docker image with Buildx
7371
# https://github.com/docker/build-push-action
@@ -159,7 +157,7 @@ jobs:
159157
with:
160158
path: |
161159
home-nonroot-cache-uv
162-
key: cache-uv-${{ hashFiles('uv.lock') }}
160+
key: cache-uv-${{ env.PLATFORM_PAIR }}-${{ hashFiles('uv.lock') }}
163161

164162
- name: APT Build Caches for Docker APT
165163
id: docker-build-apt-cache
@@ -168,7 +166,7 @@ jobs:
168166
path: |
169167
var-cache-apt
170168
var-lib-apt
171-
key: cache-apt-${{ hashFiles('Dockerfile') }}
169+
key: cache-apt-${{ env.PLATFORM_PAIR }}-${{ hashFiles('Dockerfile') }}
172170

173171
- name: Inject UV cache in docker
174172
uses: reproducible-containers/[email protected]
@@ -177,7 +175,6 @@ jobs:
177175
{
178176
"home-nonroot-cache-uv": "/home/nonroot/.cache/uv"
179177
}
180-
skip-extraction: ${{ steps.docker-build-uv-cache.outputs.cache-hit }}
181178
182179
- name: Inject APT cache in docker
183180
uses: reproducible-containers/[email protected]
@@ -187,7 +184,6 @@ jobs:
187184
"var-cache-apt": "/var/cache/apt",
188185
"var-lib-apt": "/var/lib/apt"
189186
}
190-
skip-extraction: ${{ steps.docker-build-apt-cache.outputs.cache-hit }}
191187
192188
# This build an image WITHOUT tags and outputs the digests, so that we can aggragate them later
193189
- name: Build and push production image

0 commit comments

Comments
 (0)