From a47bdc1ba7ff66d91d2c2d276b5e5a6a11d17c29 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Sat, 29 Jun 2024 20:21:41 +0200 Subject: [PATCH 1/2] build: update Signed-off-by: AuxXxilium --- .github/workflows/build.yml | 4 ++-- img-gen.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7777cfa32..792be2ebf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -181,8 +181,8 @@ jobs: #mv -f "arc-2G.img" "arc.img" echo "Image Converter" - qemu-img convert arc.img -O vmdk -o 'adapter_type=lsilogic,subformat=streamOptimized,compat6' arc-dyn.vmdk - qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic -o subformat=monolithicFlat arc.vmdk + qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic,compat6 arc-dyn.vmdk + qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat,compat6 arc.vmdk qemu-img convert arc.img -O vhdx -o subformat=dynamic arc.vhdx echo "Create Arc ova" diff --git a/img-gen.sh b/img-gen.sh index 913073031..ba81fad52 100755 --- a/img-gen.sh +++ b/img-gen.sh @@ -62,5 +62,6 @@ sudo losetup --detach ${LOOPX} #resizeImg "arc.img" "+1024M" "arc-2G.img" #mv -f "arc-2G.img" "arc.img" -qemu-img convert -O vmdk arc.img arc-dyn.vmdk -qemu-img convert -O vmdk -o adapter_type=lsilogic arc.img -o subformat=monolithicFlat arc.vmdk \ No newline at end of file +qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic,compat6 arc-dyn.vmdk +qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat,compat6 arc.vmdk +qemu-img convert arc.img -O vhdx -o subformat=dynamic arc.vhdx \ No newline at end of file From 875376902e3de6265b9d6f539230779a10c94176 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Sat, 29 Jun 2024 20:25:08 +0200 Subject: [PATCH 2/2] custom: update Signed-off-by: AuxXxilium --- .github/workflows/autobuild.yml | 5 +++-- .github/workflows/custom.yml | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index f0b9edde3..8f854ac6f 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -110,8 +110,9 @@ jobs: #mv -f "arc-2G.img" "arc.img" echo "Image Converter" - qemu-img convert -O vmdk arc.img arc-dyn.vmdk - qemu-img convert -O vmdk -o adapter_type=lsilogic arc.img -o subformat=monolithicFlat arc.vmdk + qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic,compat6 arc-dyn.vmdk + qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat,compat6 arc.vmdk + qemu-img convert arc.img -O vhdx -o subformat=dynamic arc.vhdx echo "Create Arc ova" convertova "arc.img" "arc.ova" diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml index c202b35af..d20338d1b 100644 --- a/.github/workflows/custom.yml +++ b/.github/workflows/custom.yml @@ -149,10 +149,13 @@ jobs: if [ "${{ env.FORMAT }}" = "dyn" ]; then echo "Image Converter -> dyn" - qemu-img convert -O vmdk arc.img arc-dyn.vmdk + qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic,compat6 arc-dyn.vmdk elif [ "${{ env.FORMAT }}" = "flat" ]; then echo "Image Converter -> flat" - qemu-img convert -O vmdk -o adapter_type=lsilogic arc.img -o subformat=monolithicFlat arc.vmdk + qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat,compat6 arc.vmdk + elif [ "${{ env.FORMAT }}" = "vhdx" ]; then + echo "Image Converter -> vhdx" + qemu-img convert arc.img -O vhdx -o subformat=dynamic arc.vhdx fi # Zip image and generate checksum @@ -179,6 +182,13 @@ jobs: echo "Upload failed" exit 1 fi + elif [ "${{ env.FORMAT }}" = "vhdx" ]; then + zip -9 "arc-${{ env.MODEL }}-${{ env.PRODUCTVER }}-${{ env.VERSION }}.vhdx.zip" arc.vhdx + UPLOAD="$(curl -k -F "file=@arc-${{ env.MODEL }}-${{ env.PRODUCTVER }}-${{ env.VERSION }}.vhdx.zip" "https://file.io")" + if ! echo "${UPLOAD}" | grep -oP '"link":\s*"\K[^"]+'; then + echo "Upload failed" + exit 1 + fi fi EMAIL=$(curl -s -H "Authorization: token ${{ secrets.ACTION }}" "https://api.github.com/users/${{ github.event.issue.user.login }}" | jq -r '.email')