diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 3a785800..45eba52a 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -297,8 +297,8 @@ jobs: zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmdk.zip" -j rr/rr.vmdk ${USER_CONFIG_FILE} sha256sum README.txt elif [ "${{ env.format }}" = "vhd" ]; then . scripts/func.sh "${{ secrets.RRORG }}" - createvmc "rr/rr.vmc" qemu-img convert rr/rr.img -O vpc rr/rr.vhd + createvmc "rr/rr.vhd" "rr/rr.vmc" (cd rr; sha256sum rr.vhd >../sha256sum) zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vhd.zip" -j rr/rr.vmc rr/rr.vhd ${USER_CONFIG_FILE} sha256sum README.txt elif [ "${{ env.format }}" = "vhdx" ]; then diff --git a/scripts/func.sh b/scripts/func.sh index 24a999ae..b7e37250 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -442,8 +442,17 @@ function convertova() { rm -rf "VMX_${VMNAME}" } +# createvmc +# $1 vhd file +# $2 vmc file function createvmc() { - cat <<_EOF_ >"${1:-rr.vmc}" + local BLIMAGE=${1:-rr.vhd} + local VMCPATH=${2:-rr.vmc} + + BLIMAGE="$(basename "${BLIMAGE}")" + VMCPATH="$(realpath "${VMCPATH}")" + + cat <<_EOF_ >"${VMCPATH}" 2.0 @@ -457,7 +466,7 @@ function createvmc() { 1 - rr.vhd + ${BLIMAGE}