diff --git a/.github/workflows/mikrotik_patch_6.yml b/.github/workflows/mikrotik_patch_6.yml index 467e2d6..f2d5614 100644 --- a/.github/workflows/mikrotik_patch_6.yml +++ b/.github/workflows/mikrotik_patch_6.yml @@ -170,40 +170,40 @@ jobs: sudo rm chr.img.zip sudo mv chr-$LATEST_VERSION.img chr.img - # - name: Create chr-${{ env.LATEST_VERSION }}.img - # if: steps.get_latest.outputs.has_new_version == 'true' - # run: | - # sudo mkdir ./chr - # sudo cp chr.img chr-$LATEST_VERSION.img - # sudo qemu-nbd -c /dev/nbd0 -f raw chr-$LATEST_VERSION.img - # sudo mount /dev/nbd0p1 ./chr - # sudo -E python3 patch.py kernel ./chr/boot/initrd.rgz - # sudo cp ./all_packages/ipv6-$LATEST_VERSION.npk ./chr/var/pdb/ipv6/image - # sudo cp ./all_packages/dude-$LATEST_VERSION.npk ./chr/var/pdb/dude/image - # sudo cp ./all_packages/system-$LATEST_VERSION.npk ./chr/var/pdb/routeros-x86/image - # sudo umount ./chr - # sudo qemu-nbd -d /dev/nbd0 - # sudo rm -rf ./chr + - name: Create chr-${{ env.LATEST_VERSION }}.img + if: steps.get_latest.outputs.has_new_version == 'true' + run: | + sudo mkdir ./chr + sudo cp chr.img chr-$LATEST_VERSION.img + sudo qemu-nbd -c /dev/nbd0 -f raw chr-$LATEST_VERSION.img + sudo mount /dev/nbd0p1 ./chr + sudo -E python3 patch.py kernel ./chr/boot/initrd.rgz + sudo cp ./all_packages/ipv6-$LATEST_VERSION.npk ./chr/var/pdb/ipv6/image + sudo cp ./all_packages/dude-$LATEST_VERSION.npk ./chr/var/pdb/dude/image + sudo cp ./all_packages/system-$LATEST_VERSION.npk ./chr/var/pdb/routeros-x86/image + sudo umount ./chr + sudo qemu-nbd -d /dev/nbd0 + sudo rm -rf ./chr - # sudo qemu-img convert -f raw -O qcow2 chr-$LATEST_VERSION.img chr-$LATEST_VERSION.qcow2 - # sudo qemu-img convert -f raw -O vmdk chr-$LATEST_VERSION.img chr-$LATEST_VERSION.vmdk - # sudo qemu-img convert -f raw -O vpc chr-$LATEST_VERSION.img chr-$LATEST_VERSION.vhd - # sudo qemu-img convert -f raw -O vhdx chr-$LATEST_VERSION.img chr-$LATEST_VERSION.vhdx - # sudo qemu-img convert -f raw -O vdi chr-$LATEST_VERSION.img chr-$LATEST_VERSION.vdi + sudo qemu-img convert -f raw -O qcow2 chr-$LATEST_VERSION.img chr-$LATEST_VERSION.qcow2 + sudo qemu-img convert -f raw -O vmdk chr-$LATEST_VERSION.img chr-$LATEST_VERSION.vmdk + sudo qemu-img convert -f raw -O vpc chr-$LATEST_VERSION.img chr-$LATEST_VERSION.vhd + sudo qemu-img convert -f raw -O vhdx chr-$LATEST_VERSION.img chr-$LATEST_VERSION.vhdx + sudo qemu-img convert -f raw -O vdi chr-$LATEST_VERSION.img chr-$LATEST_VERSION.vdi - # sudo zip chr-$LATEST_VERSION.qcow2.zip chr-$LATEST_VERSION.qcow2 - # sudo zip chr-$LATEST_VERSION.vmdk.zip chr-$LATEST_VERSION.vmdk - # sudo zip chr-$LATEST_VERSION.vhd.zip chr-$LATEST_VERSION.vhd - # sudo zip chr-$LATEST_VERSION.vhdx.zip chr-$LATEST_VERSION.vhdx - # sudo zip chr-$LATEST_VERSION.vdi.zip chr-$LATEST_VERSION.vdi - # sudo zip chr-$LATEST_VERSION.img.zip chr-$LATEST_VERSION.img + sudo zip chr-$LATEST_VERSION.qcow2.zip chr-$LATEST_VERSION.qcow2 + sudo zip chr-$LATEST_VERSION.vmdk.zip chr-$LATEST_VERSION.vmdk + sudo zip chr-$LATEST_VERSION.vhd.zip chr-$LATEST_VERSION.vhd + sudo zip chr-$LATEST_VERSION.vhdx.zip chr-$LATEST_VERSION.vhdx + sudo zip chr-$LATEST_VERSION.vdi.zip chr-$LATEST_VERSION.vdi + sudo zip chr-$LATEST_VERSION.img.zip chr-$LATEST_VERSION.img - # sudo rm chr-$LATEST_VERSION$ARCH.qcow2 - # sudo rm chr-$LATEST_VERSION$ARCH.vmdk - # sudo rm chr-$LATEST_VERSION$ARCH.vhd - # sudo rm chr-$LATEST_VERSION$ARCH.vhdx - # sudo rm chr-$LATEST_VERSION$ARCH.vdi - # sudo rm chr-$LATEST_VERSION$ARCH.img + sudo rm chr-$LATEST_VERSION$ARCH.qcow2 + sudo rm chr-$LATEST_VERSION$ARCH.vmdk + sudo rm chr-$LATEST_VERSION$ARCH.vhd + sudo rm chr-$LATEST_VERSION$ARCH.vhdx + sudo rm chr-$LATEST_VERSION$ARCH.vdi + sudo rm chr-$LATEST_VERSION$ARCH.img - name: Upload Files @@ -211,9 +211,9 @@ jobs: run: | mkdir -p ./publish/$LATEST_VERSION if [ "${{ matrix.channel }}" == "long-term" ]; then - LATEST="LATEST.6fix" + LATEST="NEWEST6.long-term" elif [ "${{ matrix.channel }}" == "stable" ]; then - LATEST="LATEST.6" + LATEST="NEWEST6.stable" fi echo $LATEST_VERSION $BUILD_TIME > ./publish/$LATEST cp CHANGELOG ./publish/$LATEST_VERSION/ @@ -248,7 +248,7 @@ jobs: name: "RouterOS ${{ env.LATEST_VERSION }}" body_path: "CHANGELOG" tag_name: ${{ env.LATEST_VERSION }} - # make_latest: ${{ matrix.channel == 'stable'}} + make_latest: false prerelease: ${{ matrix.channel == 'testing' }} files: | mikrotik-${{ env.LATEST_VERSION }}.iso diff --git a/busybox/busybox_aarch64 b/busybox/busybox_aarch64 index 72cca47..ee4d729 100644 Binary files a/busybox/busybox_aarch64 and b/busybox/busybox_aarch64 differ diff --git a/busybox/busybox_x86 b/busybox/busybox_x86 index e6ed29d..68fe7a9 100644 Binary files a/busybox/busybox_x86 and b/busybox/busybox_x86 differ diff --git a/keygen/keygen_aarch64 b/keygen/keygen_aarch64 index 4f8f852..1b7d71c 100644 Binary files a/keygen/keygen_aarch64 and b/keygen/keygen_aarch64 differ diff --git a/keygen/keygen_x86 b/keygen/keygen_x86 index d23bc8e..7fa204b 100644 Binary files a/keygen/keygen_x86 and b/keygen/keygen_x86 differ