ci: fix static binary copy (#451)

dunglas · withinboredom · web-flow · commit d4c313f3db04 · 2024-01-08T12:03:36.000+01:00
* ci: fix static binary copy

* Update static.yaml

Co-authored-by: Rob Landers &lt;landers.robert@gmail.com&gt;

* fix

* fix

* fix

---------

Co-authored-by: Rob Landers &lt;landers.robert@gmail.com&gt;
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -169,12 +169,10 @@ jobs:
         run: |
           mkdir -p /tmp/metadata/builder /tmp/metadata/runner
 
-          # shellcheck disable=SC2086
-          builderDigest=$(jq -r '."builder-${{ matrix.variant }}"."containerimage.digest"' <<< ${METADATA})
+          builderDigest=$(jq -r '."builder-${{ matrix.variant }}"."containerimage.digest"' <<< "${METADATA}")
           touch "/tmp/metadata/builder/${builderDigest#sha256:}"
 
-          # shellcheck disable=SC2086
-          runnerDigest=$(jq -r '."runner-${{ matrix.variant }}"."containerimage.digest"' <<< ${METADATA})
+          runnerDigest=$(jq -r '."runner-${{ matrix.variant }}"."containerimage.digest"' <<< "${METADATA}")
           touch "/tmp/metadata/runner/${runnerDigest#sha256:}"
         env:
           METADATA: ${{ steps.build.outputs.metadata }}
diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml
@@ -141,11 +141,11 @@ jobs:
         name: Copy binary
         if: ${{ !fromJson(needs.prepare.outputs.push) }}
         run: |
-          image=$(jq -r '."static-builder"."containerimage.config.digest"' <<< "${METADATA}")
-          container=$(docker create --platform=${{ matrix.platform }} --name static-builder "${image}")
-          docker cp "${container}:/go/src/app/dist/${BINARY}" "${BINARY}"
+          digest=$(jq -r '."static-builder"."containerimage.config.digest"' <<< "${METADATA}")
+          docker create --platform=${{ matrix.platform }} --name static-builder "${digest}"
+          docker cp "static-builder:/go/src/app/dist/${BINARY}" "${BINARY}"
         env:
-          METADATA: ${{ needs.prepare.outputs.metadata }}
+          METADATA: ${{ steps.build.outputs.metadata }}
           BINARY: frankenphp-linux-${{ matrix.platform == 'linux/amd64' && 'x86_64' || 'aarch64' }}
       -
         name: Upload artifact
