Skip to content

Commit 9b502bc

Browse files
committed
test
1 parent b52291d commit 9b502bc

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/docker-parallel-multiarch-build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,16 @@ jobs:
113113
- name: Prepare variables
114114
id: vars
115115
run: |
116-
platform="${{ matrix.platform }}"
117-
image="${{ steps.meta.outputs.tags }}"
116+
platform='${{ matrix.platform }}'
117+
image='${{ steps.meta.outputs.tags }}'
118118
119119
{
120120
echo "platform-pair=${platform//\//-}"
121121
echo "platform-pair-un=${platform//\//_}"
122122
echo "image=${image%%:*}"
123123
124124
echo "cache-map<<9743a66f914cc249efca164485a19c5c"
125-
jq --arg 'id_suffix' '-linux/amd64' 'to_entries | map({(.key): {target: .value, id: "\(.key)\($id_suffix)"}})' << 9743a66f914cc249efca164485a19c5c
125+
jq --arg 'id_suffix' '-${{ matrix.platform }}' 'to_entries | map({(.key): {target: .value, id: "\(.key)\($id_suffix)"}})' << 9743a66f914cc249efca164485a19c5c
126126
${{ inputs.buildkit-mount-caches }}
127127
9743a66f914cc249efca164485a19c5c
128128
echo "9743a66f914cc249efca164485a19c5c"
@@ -136,19 +136,19 @@ jobs:
136136
137137
cat $GITHUB_OUTPUT
138138
139-
# TODO
140139
- name: Setup buildkit mount cache
141140
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
141+
if: steps.vars.outputs.cache-paths
142142
with:
143143
path: |
144144
${{ steps.vars.outputs.cache-paths }}
145145
key: buildkit-mount-${{ inputs.title }}-${{ steps.vars.outputs.platform-pair }}-${{ github.sha }}
146146
restore-keys: |
147147
buildkit-mount-${{ inputs.title }}-${{ steps.vars.outputs.platform-pair }}-
148148
149-
# TODO
150149
- name: Inject buildkit mount cache into docker
151150
uses: reproducible-containers/buildkit-cache-dance@5b6db76d1da5c8b307d5d2e0706d266521b710de # v3.1.2
151+
if: steps.vars.outputs.cache-paths
152152
with:
153153
cache-map: |
154154
${{ steps.vars.outputs.cache-map }}

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
platforms: ${{ matrix.platforms }}
6666
registry: ghcr.io
6767
image-name: ${{ github.repository }}/${{ matrix.container }}
68+
buildkit-mount-caches: '{"home-cache": "/root/.cache", "home-cargo": "/root/.cargo"}'
6869
secrets:
6970
registry-username: ${{ github.actor }}
7071
registry-password: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)