Skip to content

Commit a024916

Browse files
committed
Fix manifest creation
1 parent f29def3 commit a024916

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/on-tag.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -240,18 +240,18 @@ jobs:
240240
- name: Create :X.Y manifests
241241
if: steps.tags.outputs.minor != ''
242242
run: |
243-
SHORT="${{steps.tags.outputs.minor}}"
244-
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "fuse" "${SHORT}-fuse"
245-
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "nofuse" "${SHORT}-nofuse"
246-
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "nofuse"
243+
minor="${{steps.tags.outputs.minor}}"
244+
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "fuse" "${minor}-fuse"
245+
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "nofuse" "${minor}-nofuse"
246+
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "nofuse" "${minor}"
247247
248248
- name: Create :X manifests
249249
if: steps.tags.outputs.major != ''
250250
run: |
251-
SHORT="${{steps.tags.outputs.major}}"
252-
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "fuse" "${SHORT}-fuse"
253-
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "nofuse" "${SHORT}-nofuse"
254-
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "nofuse"
251+
major="${{steps.tags.outputs.major}}"
252+
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "fuse" "${major}-fuse"
253+
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "nofuse" "${major}-nofuse"
254+
./scripts/ci-create-manifest.sh "${SLUG}" "${VERSION}" "nofuse" "${major}"
255255
256256
- name: Create :latest manifests
257257
if: steps.tags.outputs.latest != ''

scripts/ci-create-manifest.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ docker manifest annotate "${MANIFEST}" "${IMAGE_ARM64}" --os linux --arch ar
2323
docker manifest annotate "${MANIFEST}" "${IMAGE_ARM7}" --os linux --arch arm --variant v7
2424
docker manifest annotate "${MANIFEST}" "${IMAGE_ARM6}" --os linux --arch arm --variant v6
2525
docker manifest push "${MANIFEST}"
26+
27+
echo

0 commit comments

Comments
 (0)