From 7625d1227db782fe1bf436b32cc20100aa998fcd Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 13 Jul 2023 06:59:28 +0100 Subject: [PATCH] WIP --- .github/workflows/build-assets.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml index 41e61f1c27b..6d7a8959e49 100644 --- a/.github/workflows/build-assets.yml +++ b/.github/workflows/build-assets.yml @@ -158,15 +158,15 @@ jobs: cache-from: type=registry,ref=${{ steps.vars.outputs.docker_label }} cache-to: type=inline - # - name: Update Docker Image (vcpkg_overlays) - # run: | - # mkdir -p ${{ needs.preamble.outputs.folder_build }} - # echo "${{ secrets.SIGNING_SECRET }}" > ${{ needs.preamble.outputs.folder_build }}/private.key - # CONTAINER=$(docker run -d --mount ${{ needs.preamble.outputs.mount_platform }} --mount ${{ needs.preamble.outputs.mount_build }} ${{ steps.vars.outputs.docker_label }} "tail -f /dev/null") - # docker exec $CONTAINER /bin/bash -c "${{ needs.preamble.outputs.gpg_import }} && cmake -S /hpcc-dev/HPCC-Platform -B /hpcc-dev/build ${{ needs.preamble.outputs.cmake_docker_config }} -DSIGN_MODULES_PASSPHRASE=${{ secrets.SIGN_MODULES_PASSPHRASE }} -DSIGN_MODULES_KEYID=${{ secrets.SIGN_MODULES_KEYID }} -DINCLUDE_PLUGINS=ON -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=OFF" - # docker commit $CONTAINER ${{ steps.vars.outputs.docker_label }} - # docker push $CONTAINER ${{ steps.vars.outputs.docker_label }} - # docker rm -f $CONTAINER + - name: Update Docker Image (vcpkg_overlays) + run: | + mkdir -p ${{ needs.preamble.outputs.folder_build }} + echo "${{ secrets.SIGNING_SECRET }}" > ${{ needs.preamble.outputs.folder_build }}/private.key + CONTAINER=$(docker run -d --mount ${{ needs.preamble.outputs.mount_platform }} --mount ${{ needs.preamble.outputs.mount_build }} ${{ steps.vars.outputs.docker_label }} "tail -f /dev/null") + docker exec $CONTAINER /bin/bash -c "${{ needs.preamble.outputs.gpg_import }} && cmake -S /hpcc-dev/HPCC-Platform -B /hpcc-dev/build ${{ needs.preamble.outputs.cmake_docker_config }} -DSIGN_MODULES_PASSPHRASE=${{ secrets.SIGN_MODULES_PASSPHRASE }} -DSIGN_MODULES_KEYID=${{ secrets.SIGN_MODULES_KEYID }} -DINCLUDE_PLUGINS=ON -DCONTAINERIZED=OFF -DCPACK_STRIP_FILES=OFF" + docker commit $CONTAINER ${{ steps.vars.outputs.docker_label }} + docker push $CONTAINER ${{ steps.vars.outputs.docker_label }} + docker rm -f $CONTAINER - name: CMake Packages if: ${{ !matrix.container && !matrix.ln && !matrix.documentation }}