From 468c599735791fcb72d03c296e7460452f5c8f56 Mon Sep 17 00:00:00 2001 From: Noel Miller Date: Thu, 7 Mar 2024 12:15:09 -0600 Subject: [PATCH] fix: action and entrypoint --- action.yml | 6 +++--- entrypoint.sh | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index b67de58..392d809 100644 --- a/action.yml +++ b/action.yml @@ -65,7 +65,7 @@ runs: # Check if running inside of the action repo if [[ -z "${{ github.action_ref }}" ]]; then if [[ "${{ github.ref_name }}" =~ (.*)/merge ]]; then tag=pr-${BASH_REMATCH[1]}; else tag=${{ github.ref_name }}; fi; fi if [[ -z "${tag}" ]]; then tag=${{ github.action_ref }}; fi - docker run --privileged --volume /github/workspace:/build-container-installer/build ghcr.io/jasonn3/build-container-installer:${tag} \ + docker run --privileged --volume ${{ github.workspace }}:/github/workspace ghcr.io/jasonn3/build-container-installer:${tag} \ ARCH=${{ inputs.arch }} \ IMAGE_NAME=${{ inputs.image_name }} \ IMAGE_REPO=${{ inputs.image_repo }} \ @@ -80,8 +80,8 @@ runs: - name: Rename ISO file shell: bash run: | - mv /github/workspace/deploy.iso /github/workspace/${{ inputs.iso_name }}.iso - cd /github/workspace + mv ${{ github.workspace }}/deploy.iso ${{ github.workspace }}/${{ inputs.iso_name }}.iso + cd ${{ github.workspace }} sha256sum ${{ inputs.iso_name }}.iso > ${{ inputs.iso_name }}-CHECKSUM echo "ISO_PATH=$(realpath ${{ github.workspace }}/${{ inputs.iso_name }}.iso)" >> $GITHUB_OUTPUT echo "CHECKSUM_PATH=$(realpath ${{ github.workspace }}/${{ inputs.iso_name }}-CHECKSUM)" >> $GITHUB_OUTPUT diff --git a/entrypoint.sh b/entrypoint.sh index 2c516bb..55618b8 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -15,3 +15,6 @@ make boot.iso $@ # Add container to ISO make build/deploy.iso $@ + +cp build/deploy.iso /github/workspace/build +chmod -R ugo=rwx /github/workspace/build \ No newline at end of file