diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index f288274b..4a73a588 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -38,6 +38,7 @@ jobs: warinfo = 'false' format = '' + size = '' language= '' model = '' version = '' @@ -49,6 +50,7 @@ jobs: jsonbody = json.loads(issuebody) iscustom = 'true' format = jsonbody.get('format', '') + size = jsonbody.get('size', '') language = jsonbody.get('language', '') model = jsonbody.get('model', '') version = jsonbody.get('version', '') @@ -66,6 +68,7 @@ jobs: set_output("warinfo", warinfo) set_output("format", format) + set_output("size", size) set_output("language", language) set_output("model", model) set_output("version", version) @@ -262,6 +265,23 @@ jobs: exit 1 fi + case "${{ env.size }}" in + 2GB) + echo "2GB" + ;; + 4GB) + echo "4GB" + sudo ./localbuild.sh resize rr/rr.img +2048M + ;; + 8GB) + echo "8GB" + sudo ./localbuild.sh resize rr/rr.img +6144M + ;; + *) + echo "unknown size" + ;; + esac + ls rr -al RR_VERSION_FILE="rr/ws/mnt/p1/RR_VERSION" @@ -283,38 +303,52 @@ jobs: echo "Of course, you can also modify the settings yourself." } >README.txt - if [ "${{ env.format }}" = "ova" ]; then - . scripts/func.sh "${{ secrets.RRORG }}" - convertova "rr/rr.img" "rr/rr.ova" - (cd rr && sha256sum rr.ova >../sha256sum) - zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.ova.zip" -j rr/rr.ova ${USER_CONFIG_FILE} sha256sum README.txt - elif [ "${{ env.format }}" = "vmx" ]; then - . scripts/func.sh "${{ secrets.RRORG }}" - convertvmx "rr/rr.img" "rr.vmx" # rr.vmx is a directory - (cd rr.vmx && sha256sum * >../sha256sum) - zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmx.zip" -r rr.vmx ${USER_CONFIG_FILE} sha256sum README.txt - elif [ "${{ env.format }}" = "vmdk" ]; then - qemu-img convert rr/rr.img -O vmdk -o 'adapter_type=lsilogic,subformat=streamOptimized,compat6' rr/rr.vmdk - (cd rr && sha256sum rr.vmdk >../sha256sum) - zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmdk.zip" -j rr/rr.vmdk ${USER_CONFIG_FILE} sha256sum README.txt - elif [ "${{ env.format }}" = "flat" ]; then - qemu-img convert rr/rr.img -O vmdk -o 'adapter_type=lsilogic,subformat=monolithicFlat,compat6' rr/rr.vmdk - (cd rr && sha256sum rr*.vmdk >../sha256sum) - zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.flat.zip" -j rr/rr*.vmdk ${USER_CONFIG_FILE} sha256sum README.txt - elif [ "${{ env.format }}" = "vhd" ]; then - . scripts/func.sh "${{ secrets.RRORG }}" - 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 - qemu-img convert rr/rr.img -O vhdx -o subformat=dynamic rr/rr.vhdx - (cd rr && sha256sum rr.vhdx >../sha256sum) - zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vhdx.zip" -j rr/rr.vhdx ${USER_CONFIG_FILE} sha256sum README.txt - else - (cd rr && sha256sum rr.img >../sha256sum) - zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.img.zip" -j rr/rr.img ${USER_CONFIG_FILE} sha256sum README.txt - fi + case "${{ env.format }}" in + ova) + echo "OVA" + . scripts/func.sh "${{ secrets.RRORG }}" + convertova "rr/rr.img" "rr/rr.ova" + (cd rr && sha256sum rr.ova >../sha256sum) + zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.ova.zip" -j rr/rr.ova ${USER_CONFIG_FILE} sha256sum README.txt + ;; + vmx) + echo "VMX" + . scripts/func.sh "${{ secrets.RRORG }}" + convertvmx "rr/rr.img" "rr.vmx" # rr.vmx is a directory + (cd rr.vmx && sha256sum * >../sha256sum) + zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmx.zip" -r rr.vmx ${USER_CONFIG_FILE} sha256sum README.txt + ;; + vmdk) + echo "VMDK" + qemu-img convert rr/rr.img -O vmdk -o 'adapter_type=lsilogic,subformat=streamOptimized,compat6' rr/rr.vmdk + (cd rr && sha256sum rr.vmdk >../sha256sum) + zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmdk.zip" -j rr/rr.vmdk ${USER_CONFIG_FILE} sha256sum README.txt + ;; + flat) + echo "FLAT" + qemu-img convert rr/rr.img -O vmdk -o 'adapter_type=lsilogic,subformat=monolithicFlat,compat6' rr/rr.vmdk + (cd rr && sha256sum rr*.vmdk >../sha256sum) + zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.flat.zip" -j rr/rr*.vmdk ${USER_CONFIG_FILE} sha256sum README.txt + ;; + vhd) + echo "VHD" + . scripts/func.sh "${{ secrets.RRORG }}" + 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 + ;; + vhdx) + echo "VHDX" + qemu-img convert rr/rr.img -O vhdx -o subformat=dynamic rr/rr.vhdx + (cd rr && sha256sum rr.vhdx >../sha256sum) + zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vhdx.zip" -j rr/rr.vhdx ${USER_CONFIG_FILE} sha256sum README.txt + ;; + *) + echo "IMG" + (cd rr && sha256sum rr.img >../sha256sum) + zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.img.zip" -j rr/rr.img ${USER_CONFIG_FILE} sha256sum README.txt + esac echo "TAG=${TAG}" >> $GITHUB_ENV diff --git a/docs/issues.html b/docs/issues.html index d53e683f..45c70a79 100644 --- a/docs/issues.html +++ b/docs/issues.html @@ -207,7 +207,7 @@ let formData = new FormData(form); var title = "custom"; var body = {}; - var _parameters = ["title", "format", "language", "model", "version", "kernel", "addons", "modules"]; + var _parameters = ["title", "format", "size", "language", "model", "version", "kernel", "addons", "modules"]; for (var key in _parameters) { var name = _parameters[key]; if ($("#" + name).is(":hidden")) { continue; } @@ -301,6 +301,18 @@ +