...

pdidev · Dec 2, 2024 · 8942116 · 8942116
1 parent b8d16bf
commit 8942116
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml
@@ -54,19 +54,11 @@ runs:
       name: ${{ inputs.distribution }}
       path: ./${{ inputs.distribution }}
   - name: Make artifact descriptor container
-    env:
-      DISTRIB: ${{ inputs.distribution }}
-      ARTIFACT: ${{ steps.artifact.outputs.artifact-url }}
-      OUTPUT: ${{ steps.artifact.outputs.artifact-url }}
     shell: bash
     run: |
-      echo artifact-url: "${{ steps.artifact.outputs.artifact-url }}"
-      echo ARTIFACT: "${ARTIFACT}"
-      echo artifact.output: "${{ steps.artifact.outputs }}"
-      echo OUTPUT: "${OUTPUT}"
-      echo "${ARTIFACT}" > artifact.url
-      tar -c artifact.url | docker import - ghcr.io/pdidev/pkgs/lastbuild:${DISTRIB}
-      docker push ghcr.io/pdidev/pkgs/lastbuild:${DISTRIB}
+      echo "${{ steps.artifact.outputs.artifact-url }}" > artifact.url
+      tar -c artifact.url | docker import - ghcr.io/pdidev/pkgs/lastbuild:${{ inputs.distribution }}
+      docker push ghcr.io/pdidev/pkgs/lastbuild:${{ inputs.distribution }}
   - name: Aggregate sources
     shell: bash
     run: |
@@ -78,7 +70,7 @@ runs:
         CID="$(docker create ghcr.io/pdidev/pkgs/lastbuild:debian /bin/bash)"
         docker cp "${CID}:artifact.url" "../${DISTRIB}.url"
         echo curl "$(cat ../${DISTRIB}.url)"
-        curl "$(cat ../${DISTRIB}.url)" | tar -x
+        curl "$(cat ../${DISTRIB}.url)" | unzip -
       done
   - name: Upload page artifact
     uses: actions/upload-pages-artifact@v3