diff --git a/.github/workflows/patch_v7.yml b/.github/workflows/patch_v7.yml index a80f670..d35dcb6 100644 --- a/.github/workflows/patch_v7.yml +++ b/.github/workflows/patch_v7.yml @@ -954,7 +954,9 @@ jobs: echo "| Main package | $(link_file "$PUBLISH_DIR/routeros-${VERSION}${ARCH_EXT}.npk") |" >> "$RELEASE_BODY" echo "| Extra packages | $(link_file "$PUBLISH_DIR/all_packages-$ARCH-$VERSION.zip") |" >> "$RELEASE_BODY" - echo "| ISO Image | $(link_file "$PUBLISH_DIR/mikrotik-${VERSION}${ARCH_EXT}.iso") |" >> "$RELEASE_BODY" + if [ "$ARCH" == "x86" ] || [ "$ARCH" == "arm64" ]; then + echo "| ISO Image | $(link_file "$PUBLISH_DIR/mikrotik-${VERSION}${ARCH_EXT}.iso") |" >> "$RELEASE_BODY" + fi if [ "$ARCH" == "x86" ]; then echo "| Install Image | $(link_file "$PUBLISH_DIR/install-image-$VERSION.zip") |" >> "$RELEASE_BODY" echo "| Netinstall | $(link_file "$PUBLISH_DIR/netinstall-$VERSION.zip") |" >> "$RELEASE_BODY" @@ -962,41 +964,41 @@ jobs: echo "" >> "$RELEASE_BODY" echo "" >> "$RELEASE_BODY" - echo "
Cloud Hosted Router (CHR)" >> "$RELEASE_BODY" - echo "" >> "$RELEASE_BODY" - if [ "$ARCH" == "x86" ]; then - echo "| Platform | UEFI | Legacy BIOS |" >> "$RELEASE_BODY" - echo "|--------|------|-------------|" >> "$RELEASE_BODY" - else - echo "| Platform | UEFI |" >> "$RELEASE_BODY" - echo "|--------|------|" >> "$RELEASE_BODY" - fi - - formats=("img" "ova" "qcow2" "vdi" "vhd" "vhdx" "vmdk") - declare -A FORMAT_PLATFORM=( - ["img"]="Raw disk image" - ["ova"]="Open Virtual Appliance" - ["qcow2"]="QEMU/KVM" - ["vdi"]="VirtualBox" - ["vhd"]="Hyper-V (legacy)" - ["vhdx"]="Hyper-V" - ["vmdk"]="VMware" - ) - - for fmt in "${formats[@]}"; do - platform="${FORMAT_PLATFORM[$fmt]}" - uefi_link=$(link_file "$PUBLISH_DIR/chr-$VERSION$ARCH_EXT.$fmt.zip") + if [ "$ARCH" == "x86" ] || [ "$ARCH" == "arm64" ]; then + echo "
Cloud Hosted Router (CHR)" >> "$RELEASE_BODY" + echo "" >> "$RELEASE_BODY" if [ "$ARCH" == "x86" ]; then - legacy_link=$(link_file "$PUBLISH_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.$fmt.zip") - echo "| $platform | $uefi_link | $legacy_link |" >> "$RELEASE_BODY" + echo "| Platform | UEFI | Legacy BIOS |" >> "$RELEASE_BODY" + echo "|--------|------|-------------|" >> "$RELEASE_BODY" else - echo "| $platform | $uefi_link |" >> "$RELEASE_BODY" + echo "| Platform | UEFI |" >> "$RELEASE_BODY" + echo "|--------|------|" >> "$RELEASE_BODY" fi - done - echo "
" >> "$RELEASE_BODY" - echo "" >> "$RELEASE_BODY" + formats=("img" "ova" "qcow2" "vdi" "vhd" "vhdx" "vmdk") + declare -A FORMAT_PLATFORM=( + ["img"]="Raw disk image" + ["ova"]="Open Virtual Appliance" + ["qcow2"]="QEMU/KVM" + ["vdi"]="VirtualBox" + ["vhd"]="Hyper-V (legacy)" + ["vhdx"]="Hyper-V" + ["vmdk"]="VMware" + ) + for fmt in "${formats[@]}"; do + platform="${FORMAT_PLATFORM[$fmt]}" + uefi_link=$(link_file "$PUBLISH_DIR/chr-$VERSION$ARCH_EXT.$fmt.zip") + if [ "$ARCH" == "x86" ]; then + legacy_link=$(link_file "$PUBLISH_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.$fmt.zip") + echo "| $platform | $uefi_link | $legacy_link |" >> "$RELEASE_BODY" + else + echo "| $platform | $uefi_link |" >> "$RELEASE_BODY" + fi + done + echo "
" >> "$RELEASE_BODY" + echo "" >> "$RELEASE_BODY" + fi echo "
Changelog" >> "$RELEASE_BODY" echo "" >> "$RELEASE_BODY" echo "
" >> "$RELEASE_BODY"
@@ -1018,10 +1020,10 @@ jobs:
         make_latest:  ${{ env.CHANNEL == 'stable' && matrix.arch == 'x86'}} 
         files: |
           ${{env.PUBLISH_DIR}}/*.zip
-          ${{env.PUBLISH_DIR}}/*.iso
-          ${{env.PUBLISH_DIR}}/routeros*.npk
           ${{env.PUBLISH_DIR}}/*.zip.sha256
+          ${{env.PUBLISH_DIR}}/*.iso
           ${{env.PUBLISH_DIR}}/*.iso.sha256
+          ${{env.PUBLISH_DIR}}/routeros*.npk
           ${{env.PUBLISH_DIR}}/routeros*.npk.sha256
 
     - name: Upload Files