diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index f062ff7..4166f52 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -1,5 +1,9 @@
name: Build CHR Docker
+
on:
+ schedule:
+ - cron: "00 10 * * *" # At UTC 09:00 (Beijing 17:00) on every day
+
workflow_dispatch:
inputs:
version:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d316248..da7a4aa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,26 +34,6 @@ jobs:
channel: long-term
release: true
secrets: inherit
-
- # Patch_Testing_V7:
- # if: |
- # (github.event_name == 'schedule') ||
- # (github.event_name == 'workflow_dispatch' && (github.event.inputs.version == 'all' || github.event.inputs.version == 'v7'))
- # uses: ./.github/workflows/patch_v7.yml
- # with:
- # channel: testing
- # release: true
- # secrets: inherit
-
- # Patch_Development_V7:
- # if: |
- # (github.event_name == 'schedule') ||
- # (github.event_name == 'workflow_dispatch' && (github.event.inputs.version == 'all' || github.event.inputs.version == 'v7'))
- # uses: ./.github/workflows/patch_v7.yml
- # with:
- # channel: development
- # release: true
- # secrets: inherit
Patch_Stable_V6:
if: |
diff --git a/.github/workflows/patch_v7.yml b/.github/workflows/patch_v7.yml
index b3a8192..3ff1256 100644
--- a/.github/workflows/patch_v7.yml
+++ b/.github/workflows/patch_v7.yml
@@ -3,15 +3,13 @@ on:
workflow_dispatch:
inputs:
channel:
- description: 'Channel (stable, long-term, testing, development)'
+ description: 'Channel (stable, long-term)'
required: true
default: 'stable'
type: choice
options:
- stable
- long-term
- # - testing
- # - development
arch:
description: 'Architecture (x86, arm64)'
required: true
@@ -22,7 +20,7 @@ on:
- x86
- arm64
version:
- description: "Specify version (e.g., 7.19.2), empty for latest"
+ description: "Specify version (e.g., 7.xx.x), empty for latest"
required: false
default: ''
type: string
@@ -185,10 +183,8 @@ jobs:
run: |
echo "Creating Option Package Squashfs for channel: $CHANNEL, arch: $ARCH"
mkdir -p $BUILD_DIR/option-root/bin/
- cp ./busybox/busybox_$ARCH $BUILD_DIR/option-root/bin/busybox
- chmod +x $BUILD_DIR/option-root/bin/busybox
- cp ./keygen/keygen_$ARCH $BUILD_DIR/option-root/bin/keygen
- chmod +x $BUILD_DIR/option-root/bin/keygen
+ install -m 755 ./busybox/busybox_$ARCH $BUILD_DIR/option-root/bin/busybox
+ install -m 755 ./keygen/keygen_$ARCH $BUILD_DIR/option-root/bin/keygen
chmod +x ./busybox/busybox_x86
COMMANDS=$(./busybox/busybox_x86 --list)
for cmd in $COMMANDS; do
@@ -415,10 +411,8 @@ jobs:
::shutdown:/sbin/openrc shutdown
EOF
- cp ./setup-routeros.sh $ROOTFS_DIR/usr/local/bin/setup-routeros
- chmod +x $ROOTFS_DIR//usr/local/bin/setup-routeros
- cp ./npkextract/npkextract $ROOTFS_DIR/usr/local/bin/npkextract
- chmod +x $ROOTFS_DIR/usr/local/bin/npkextract
+ install -m 755 ./setup-routeros.sh $ROOTFS_DIR/usr/local/bin/setup-routeros
+ install -m 755 ./npkextract/npkextract $ROOTFS_DIR/usr/local/bin/npkextract
cat << 'EOF' > $ROOTFS_DIR/root/.zprofile
if command -v setup-routeros >/dev/null 2>&1; then
@@ -644,7 +638,7 @@ jobs:
-input-charset utf-8 \
-iso-level 3 \
$BUILD_DIR/new_iso
- echo "✅ ISO created: "
+ echo "✅ arm64 ISO created: "
ls -la $PUBLISH_DIR/mikrotik-$VERSION$ARCH_EXT.iso
fi
rm -rf $BUILD_DIR/new_iso
@@ -931,6 +925,77 @@ jobs:
echo "Release not found for tag: $VERSION$ARCH_EXT)"
fi
+ - name: Generate Release Body
+ if: needs.Prepare_Patch.outputs.RELEASE == 'true'
+ run: |
+ RELEASE_BODY="$BUILD_DIR/RELEASE_BODY.md"
+ BASE_URL="https://github.com/${{ github.repository }}/releases/download/$VERSION$ARCH_EXT"
+ cat > "$RELEASE_BODY" << EOF
+ # RouterOS ${{ env.VERSION }}${{ env.ARCH_EXT }} Release
+
+ **Build Time**: $BUILD_TIME
+ **Architecture**: $ARCH
+ **Channel**: $CHANNEL
+
+ RouterOS
+
+ | Type | File |
+ |------|------|
+ EOF
+
+ link_file() {
+ local file="$1"
+ if [ -f "$file" ]; then
+ local basename=$(basename "$file")
+ echo "[$basename]($BASE_URL/$basename)"
+ else
+ echo "N/A"
+ fi
+ }
+
+ 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" ]; 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"
+ fi
+ echo "Cloud Hosted Router (CHR)
" >> "$RELEASE_BODY"
+ echo "" >> "$RELEASE_BODY"
+
+ if [ "$ARCH" == "x86" ]; then
+ echo "| Format | UEFI | Legacy BIOS |" >> "$RELEASE_BODY"
+ echo "|--------|------|-------------|" >> "$RELEASE_BODY"
+ else
+ echo "| Format | UEFI |" >> "$RELEASE_BODY"
+ echo "|--------|------|" >> "$RELEASE_BODY"
+ fi
+
+ formats=("img" "ova" "qcow2" "vdi" "vhd" "vhdx" "vmdk")
+ for fmt in "${formats[@]}"; do
+ 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 "| $fmt | $uefi_link | $legacy_link |" >> "$RELEASE_BODY"
+ else
+ echo "| $fmt | $uefi_link |" >> "$RELEASE_BODY"
+ fi
+ done
+ echo "Changelog
" >> "$RELEASE_BODY"
+ echo "" >> "$RELEASE_BODY"
+ echo "" >> "$RELEASE_BODY"
+ cat "$PUBLISH_DIR/CHANGELOG" >> "$RELEASE_BODY"
+ echo "
" >> "$RELEASE_BODY"
+ echo "