Merge pull request #2205 from AuxXxilium/dev

Dev
AuxXxilium · Jun 29, 2024 · 64f4bc1 · 64f4bc1
2 parents 2ff48d7 + 8753769
commit 64f4bc1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git 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/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/.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')

diff --git 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
+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