CI, Fix

libnare · Mar 20, 2024 · 5282de9 · 5282de9
1 parent 1861c27
commit 5282de9
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -57,16 +57,16 @@ jobs:
           # image to tar
           outputs: type=local,dest=./${{ env.OS }}-image.tar
       - name: Image ID Output
-        run: echo "${{ steps.buildx.outputs.imageid }}" > "${{ env.OS }}-image.id"
+        run: echo "${{ steps.buildx.outputs.imageid }}" > "${{ env.OS }}-image-id.txt"
       - name: Upload image id
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.OS }}-image-id
-          path: ${{ env.OS }}-image.id
+          name: ${{ env.OS }}-image-id.txt
+          path: ${{ env.OS }}-image-id.txt
       - name: Upload image tar
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.OS }}-image
+          name: ${{ env.OS }}-image.tar
           path: ${{ env.OS }}-image.tar
   tag-merge:
     permissions:
@@ -77,25 +77,25 @@ jobs:
     needs: build
 
     steps:
-      - name: Download image id
+      - name: Download image id (amd64)
         uses: actions/download-artifact@v4
         with:
-          name: amd64-image.id
-          path: amd64-image.id
-      - name: Download image id
+          name: amd64-image-id.txt
+          path: amd64-image-id.txt
+      - name: Download image id (arm64)
         uses: actions/download-artifact@v4
         with:
-          name: arm64-image.id
-          path: arm64-image.id
-      - name: Download image tar
+          name: arm64-image-id.txt
+          path: arm64-image-id.txt
+      - name: Download image tar (amd64)
         uses: actions/download-artifact@v4
         with:
-          name: amd64-image
+          name: amd64-image.tar
           path: amd64-image.tar
-      - name: Download image tar
+      - name: Download image tar (arm64)
         uses: actions/download-artifact@v4
         with:
-          name: arm64-image
+          name: arm64-image.tar
           path: arm64-image.tar
       - name: Set image id output
         id: imageid
@@ -119,9 +119,9 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v2
       - name: Load image
-        run: docker import ubuntu-image.tar
+        run: docker import amd64-image.tar
       - name: Load image
-        run: docker import macos-image.tar
+        run: docker import arm64-image.tar
       - name: Tag
         run: |
           docker manifest create \