Skip to content

Commit c448217

Browse files
authored
Merge pull request #12 from cloudstruct/ci/fix-multi-arch-manifest
ci: fix multi-arch-manifest w/ a workaround
2 parents dc01e5a + 40f2a60 commit c448217

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

.github/workflows/publish.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,15 @@ jobs:
6868
run: |
6969
rm -rf /tmp/.buildx-cache
7070
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
71-
- run: docker pull ${{ steps.meta.outputs.tags }}
72-
- run: docker tag ${{ steps.meta.outputs.tags }} ghcr.io/${{ steps.meta.outputs.tags }}
73-
- run: docker push ghcr.io/${{ steps.meta.outputs.tags }}
71+
# TEMP fix
72+
# Something strange is happening with the manifests when we push which
73+
# breaks the downstream multi-arch-manifest, so pull and push to work
74+
# around this by resubmitting manifests
75+
- name: pull-and-push
76+
run: |
77+
for t in `echo '${{ steps.meta.outputs.tags }}'`; do
78+
docker pull $t && docker push $t
79+
done
7480
7581
build-arm64:
7682
runs-on: self-hosted
@@ -128,9 +134,15 @@ jobs:
128134
run: |
129135
rm -rf /tmp/.buildx-cache
130136
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
131-
- run: docker pull ${{ steps.meta.outputs.tags }}
132-
- run: docker tag ${{ steps.meta.outputs.tags }} ghcr.io/${{ steps.meta.outputs.tags }}
133-
- run: docker push ghcr.io/${{ steps.meta.outputs.tags }}
137+
# TEMP fix
138+
# Something strange is happening with the manifests when we push which
139+
# breaks the downstream multi-arch-manifest, so pull and push to work
140+
# around this by resubmitting manifests
141+
- name: pull-and-push
142+
run: |
143+
for t in `echo '${{ steps.meta.outputs.tags }}'`; do
144+
docker pull $t && docker push $t
145+
done
134146
135147
multi-arch-manifest:
136148
runs-on: ubuntu-latest
@@ -160,6 +172,8 @@ jobs:
160172
flavor: |
161173
latest=false
162174
tags: |
175+
# Only version, no revision
176+
type=match,pattern=v(.*)-(.*),group=1
163177
# branch
164178
type=ref,event=branch
165179
# semver
@@ -183,6 +197,8 @@ jobs:
183197
flavor: |
184198
latest=false
185199
tags: |
200+
# Only version, no revision
201+
type=match,pattern=v(.*)-(.*),group=1
186202
# branch
187203
type=ref,event=branch
188204
# semver

0 commit comments

Comments
 (0)