@@ -29,7 +29,7 @@ jobs: | |||||
working-directory: ${{ env.working-directory }} | working-directory: ${{ env.working-directory }} | ||||
run: | | run: | | ||||
bash build-docker.sh | bash build-docker.sh | ||||
echo ::set-output name=filename::$(ls deploy/*.tar.xz | xargs -n 1 basename) | |||||
echo ::set-output name=filename::$(ls deploy/*.img.xz | xargs -n 1 basename) | |||||
- name: Fix Permissions | - name: Fix Permissions | ||||
id: fix_perm_filename | id: fix_perm_filename | ||||
run: | | run: | | ||||
@@ -26,7 +26,7 @@ jobs: | |||||
working-directory: ${{ env.working-directory }} | working-directory: ${{ env.working-directory }} | ||||
run: | | run: | | ||||
bash build-docker.sh | bash build-docker.sh | ||||
echo ::set-output name=filename::$(ls deploy/*.tar.xz | xargs -n 1 basename) | |||||
echo ::set-output name=filename::$(ls deploy/*.img.xz | xargs -n 1 basename) | |||||
- name: Fix Permissions | - name: Fix Permissions | ||||
id: fix_perm_filename | id: fix_perm_filename | ||||
run: | | run: | | ||||
@@ -86,13 +86,12 @@ unmount_image "${IMG_FILE}" | |||||
mkdir -p "${DEPLOY_DIR}" | mkdir -p "${DEPLOY_DIR}" | ||||
rm -f "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.tar.xz" | |||||
rm -f "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.img.xz" | |||||
rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img" | rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img" | ||||
if [ "${DEPLOY_ZIP}" == "1" ]; then | if [ "${DEPLOY_ZIP}" == "1" ]; then | ||||
pushd "${STAGE_WORK_DIR}" > /dev/null | pushd "${STAGE_WORK_DIR}" > /dev/null | ||||
tar -cJf "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.tar.xz" \ | |||||
"$(basename "${IMG_FILE}")" | |||||
xz -c "$(basename "${IMG_FILE}")" > "${DEPLOY_DIR}/${ZIP_FILENAME}${IMG_SUFFIX}.img.xz" | |||||
popd > /dev/null | popd > /dev/null | ||||
rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img" | rm -f "${DEPLOY_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img" | ||||
else | else | ||||