Fix manifest creation

lncm · Jan 23, 2020 · a024916 · a024916
1 parent f29def3
commit a024916
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
@@ -240,18 +240,18 @@ jobs:
       - name: Create :X.Y manifests
         if: steps.tags.outputs.minor != ''
         run: |
-          SHORT="${{steps.tags.outputs.minor}}"
-          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "fuse"    "${SHORT}-fuse"
-          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "nofuse"  "${SHORT}-nofuse"
-          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "nofuse"
+          minor="${{steps.tags.outputs.minor}}"
+          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "fuse"    "${minor}-fuse"
+          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "nofuse"  "${minor}-nofuse"
+          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "nofuse"  "${minor}"
 
       - name: Create :X manifests
         if: steps.tags.outputs.major != ''
         run: |
-          SHORT="${{steps.tags.outputs.major}}"
-          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "fuse"    "${SHORT}-fuse"
-          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "nofuse"  "${SHORT}-nofuse"
-          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "nofuse"
+          major="${{steps.tags.outputs.major}}"
+          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "fuse"    "${major}-fuse"
+          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "nofuse"  "${major}-nofuse"
+          ./scripts/ci-create-manifest.sh  "${SLUG}"  "${VERSION}"  "nofuse"  "${major}"
 
       - name: Create :latest manifests
         if: steps.tags.outputs.latest != ''

diff --git a/scripts/ci-create-manifest.sh b/scripts/ci-create-manifest.sh
@@ -23,3 +23,5 @@ docker manifest annotate  "${MANIFEST}"  "${IMAGE_ARM64}"  --os linux  --arch ar
 docker manifest annotate  "${MANIFEST}"  "${IMAGE_ARM7}"   --os linux  --arch arm   --variant v7
 docker manifest annotate  "${MANIFEST}"  "${IMAGE_ARM6}"   --os linux  --arch arm   --variant v6
 docker manifest push      "${MANIFEST}"
+
+echo