feat: fix nightly (#402)

metatypedev · Aug 22, 2023 · c866911 · c866911
1 parent f2a5ea4
commit c866911
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -35,9 +35,9 @@ jobs:
           cache-from: type=registry,ref=${{ env.REGISTRY_IMAGE }}:base
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
       - run: |
-          mkdir -p tmp/digests/dev
+          mkdir -p digests/dev
           digest="${{ steps.dev.outputs.digest }}"
-          touch "tmp/digests/dev/${digest#sha256:}"
+          touch "digests/dev/${digest#sha256:}"
       - uses: docker/build-push-action@v4
         id: prd
         with:
@@ -47,13 +47,13 @@ jobs:
           cache-from: type=registry,ref=${{ env.REGISTRY_IMAGE }}:nightly
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
       - run: |
-          mkdir -p tmp/digests/prd
+          mkdir -p digests/prd
           digest="${{ steps.prd.outputs.digest }}"
-          touch "tmp/digests/prd/${digest#sha256:}"
+          touch "digests/prd/${digest#sha256:}"
       - uses: actions/upload-artifact@v3
         with:
           name: digests
-          path: tmp/digests/*
+          path: ./digests/*
           if-no-files-found: error
           retention-days: 1
 
@@ -73,22 +73,17 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: digests
-          path: tmp/digests
+          path: ./digests
       - uses: docker/setup-buildx-action@v2
-      - id: info
-        run: |
-          VAR="${{ matrix.target }}_IMAGE"
-          VAR=${VAR^^}
-          echo "image=${!VAR}" >> "$GITHUB_OUTPUT"
       - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - run: |
-          cd tmp/digests/${{ matrix.target }}
-          docker buildx imagetools create --tag ${{ steps.info.outputs.image }}:${{ matrix.tag }} $(printf '${{ steps.info.outputs.image }}@sha256:%s ' *)
-          docker buildx imagetools inspect ${{ steps.info.outputs.image }}:${{ matrix.tag }}
+          cd ./digests/${{ matrix.target }}
+          docker buildx imagetools create --tag ${{ env.REGISTRY_IMAGE }}:${{ matrix.tag }} $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ matrix.tag }}
 
   cleaner:
     needs:

diff --git a/Cargo.lock b/Cargo.lock