update keygen

use musl-toolchain compile busybox
2026-08-26 10:05:50 +00:00 · 2026-08-26 01:34:39 +08:00 · 2026-08-25 21:21:44 +08:00 · 2026-08-25 19:48:01 +08:00 · 2026-08-25 17:22:51 +08:00 · 2026-08-25 17:22:35 +08:00
8 changed files with 88 additions and 41 deletions
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -7,14 +7,19 @@ on:
        required: false
        default: ''
        type: string
-        
+      force:
+        description: "Force rebuild even if version already exists"
+        required: false
+        default: false
+        type: boolean
+
 permissions:
  packages: write
 jobs:
  Prepare:
    runs-on: ubuntu-24.04
    outputs:
-      MATRIX: ${{ steps.get_versions.outputs.MATRIX }}
+      MATRIX: ${{ steps.filter_matrix.outputs.MATRIX }}
    steps:
      - name: Get versions and generate matrix
        id: get_versions
@@ -51,13 +56,53 @@ jobs:
          echo "Generated matrix: $MATRIX"
          echo "MATRIX=$MATRIX" >> $GITHUB_OUTPUT

+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Filter already-published versions from matrix
+        id: filter_matrix
+        env:
+          IMAGE: "ghcr.io/${{ github.repository_owner }}/chr"
+          FORCE: ${{ github.event.inputs.force == 'true' }}
+        run: |
+          MATRIX='${{ steps.get_versions.outputs.MATRIX }}'
+          if [ "$FORCE" = "true" ]; then
+            echo "Force mode enabled, skipping version existence check."
+            FILTERED="$MATRIX"
+          else
+            FILTERED='[]'
+            while read -r row; do
+              VERSION=$(echo "$row" | jq -r '.version')
+              CHANNEL=$(echo "$row" | jq -r '.channel')
+
+              set +e
+              docker manifest inspect "${IMAGE}:${VERSION}" >/dev/null 2>&1
+              RET=$?
+              set -e
+
+              if [ "$RET" -eq 0 ]; then
+                echo "Skipping already published version: ${VERSION}"
+              else
+                FILTERED=$(echo "$FILTERED" | jq -c --arg VERSION "$VERSION" --arg CHANNEL "$CHANNEL" '. + [{"version": $VERSION, "channel": $CHANNEL}]')
+              fi
+            done < <(echo "$MATRIX" | jq -c '.[]')
+          fi
+
+          echo "Filtered matrix: $FILTERED"
+          echo "MATRIX=$FILTERED" >> "$GITHUB_OUTPUT"
+
  Build:
+    if: needs.Prepare.outputs.MATRIX != '[]'
    runs-on: ubuntu-24.04
    needs: Prepare
    strategy:
      max-parallel: 1
      matrix:
-        include: ${{ fromJson(needs.Prepare.outputs.MATRIX) }}
+        include: ${{ fromJson(needs.Prepare.outputs.MATRIX != '[]' && needs.Prepare.outputs.MATRIX || '[{"version":"__NO_BUILD__","channel":""}]') }}
    env:
      TZ: 'Asia/Shanghai'
      VERSION: ${{ matrix.version }}
@@ -72,6 +117,13 @@ jobs:
          echo "Version: ${{ env.VERSION }}"
          echo "Channel: ${{ env.CHANNEL }}"

+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
      - name: Download CHR image
        run: |
          # x86 架构
@@ -79,6 +131,7 @@ jobs:
          wget -nv -O "amd64/chr-$VERSION.img.zip" \
            "https://github.com/elseif/MikroTikPatch/releases/download/$VERSION/chr-$VERSION-legacy-bios.img.zip"
          unzip "amd64/chr-$VERSION.img.zip" -d "amd64/"
+          mv "amd64/chr-$VERSION-legacy-bios.img" "amd64/chr.img"
          rm "amd64/chr-$VERSION.img.zip"

          # arm64 架构
@@ -86,6 +139,7 @@ jobs:
          wget -nv -O "arm64/chr-$VERSION-arm64.img.zip" \
            "https://github.com/elseif/MikroTikPatch/releases/download/$VERSION-arm64/chr-$VERSION-arm64.img.zip"
          unzip "arm64/chr-$VERSION-arm64.img.zip" -d "arm64/"
+          mv "arm64/chr-$VERSION-arm64.img" "arm64/chr.img"
          rm "arm64/chr-$VERSION-arm64.img.zip"
          
          ls -la amd64/ arm64/
@@ -185,13 +239,6 @@ jobs:
          ENTRYPOINT ["/start.sh"]
          EOF

-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v4

--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,25 +35,25 @@ jobs:
      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_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_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: |
--- a/.github/workflows/patch_v7.yml
+++ b/.github/workflows/patch_v7.yml
@@ -10,8 +10,8 @@ on:
        options:
        - stable
        - long-term
-        - testing
-        - development
+        # - testing
+        # - development
      arch:
        description: 'Architecture (x86, arm64)'
        required: true
@@ -623,7 +623,7 @@ jobs:
            truncate --size 128M $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
            sgdisk \
                --zap-all \
-                --set-alignment=8 \
+                --set-alignment=1 \
                --new=1:34:+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" \
                --new=2:0:0 --typecode=2:8300 --change-name=2:"RouterOS" \
                --gpttombr=1:2 \
@@ -632,7 +632,7 @@ jobs:
            printf '\x01' | dd of=$BUILD_DIR/mbr.bin bs=1 count=1 seek=336 conv=notrunc
            sgdisk \
                --zap-all \
-                --set-alignment=8 \
+                --set-alignment=1 \
                --new=1:34:+32M --typecode=1:EF00 --change-name=1:"RouterOS Boot" \
                --new=2:0:0 --typecode=2:8300 --change-name=2:"RouterOS" \
                $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
@@ -699,7 +699,7 @@ jobs:
            truncate --size 128M $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img
            sgdisk \
                --zap-all \
-                --set-alignment=8 \
+                --set-alignment=1 \
                --new=1:34:+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" --attributes=1:set:2 \
                --new=2:0:-4096 --typecode=2:8300 --change-name=2:"RouterOS" \
                --gpttombr=1:2 \
@@ -710,7 +710,7 @@ jobs:
            printf '\x80' | sudo dd of=$BUILD_DIR/mbr.bin bs=1 count=1 seek=446 conv=notrunc
            sgdisk \
                --zap-all \
-                --set-alignment=8 \
+                --set-alignment=1 \
                --new=1:34:+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" --attributes=1:set:2 \
                --new=2:0:-4096 --typecode=2:8300 --change-name=2:"RouterOS" \
                $BUILD_DIR/chr-$VERSION$ARCH_EXT-legacy-bios.img
@@ -782,7 +782,7 @@ jobs:
            truncate --size 128M $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
            sgdisk \
                --zap-all \
-                --set-alignment=8 \
+                --set-alignment=1 \
                --new=1:34:+32M --typecode=1:8300 --change-name=1:"RouterOS Boot" \
                --new=2:0:0 --typecode=2:8300 --change-name=2:"RouterOS" \
                --gpttombr=1:2 \
@@ -791,7 +791,7 @@ jobs:
            printf '\x01' | dd of=$BUILD_DIR/mbr.bin bs=1 count=1 seek=336 conv=notrunc
            sgdisk \
                --zap-all \
-                --set-alignment=8 \
+                --set-alignment=1 \
                --new=1:34:+32M --typecode=1:EF00 --change-name=1:"RouterOS Boot" \
                --new=2:0:0 --typecode=2:8300 --change-name=2:"RouterOS" \
                $BUILD_DIR/chr-$VERSION$ARCH_EXT.img
--- a/busybox/busybox_arm64
+++ b/busybox/busybox_arm64
--- a/busybox/busybox_x86
+++ b/busybox/busybox_x86
--- a/index.html
+++ b/index.html
@@ -442,9 +442,9 @@

            // Fetch latest version numbers from MikroTik servers
            const loadingOverlay = document.getElementById("loading");
-            const [routeros7_stable, routeros7_testing, routeros6_longterm, routeros6_stable] = await Promise.all([
+            const [routeros7_stable, routeros7_longterm, routeros6_longterm, routeros6_stable] = await Promise.all([
                fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWESTa7.stable?ts=${Date.now()}`, "7.19.4"),
-                fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWESTa7.testing?ts=${Date.now()}`, "7.20rc1"),
+                fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWESTa7.long-term?ts=${Date.now()}`, "7.20rc1"),
                fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWEST6.long-term?ts=${Date.now()}`, "6.49.18"),
                fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWEST6.stable?ts=${Date.now()}`, "6.49.19"),
            ]);
@@ -456,7 +456,7 @@
            const downloads =[
                {
                    title:"RouterOS v7",
-                    versions:[ { title:"Stable", version:routeros7_stable }, { title:"Testing", version:routeros7_testing } ],
+                    versions:[ { title:"Long-Term", version:routeros7_longterm },{ title:"Stable", version:routeros7_stable } ],
                    groups: [
                        { title:"ARM64 / AMPERE", arch:"arm64", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"ISO image for AMPERE", type:"iso" } ] },
                        { title:"X86", arch:"x86", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"CD Image", type:"iso" }, { title:"Install image", type:"install" } ] },
@@ -472,7 +472,7 @@
                },
                {
                    title:"Cloud Hosted Router",
-                    versions:[ { title:"Long-Term", version:routeros6_longterm }, { title:"Stable", version:routeros6_stable }, { title:"Stable", version:routeros7_stable }, { title:"Testing", version:routeros7_testing } ],
+                    versions:[ { title:"Long-Term", version:routeros6_longterm }, { title:"Stable", version:routeros6_stable }, { title:"Long-Term", version:routeros7_longterm }, { title:"Stable", version:routeros7_stable } ],
                    groups:[
                        { title:"X86", arch:"x86", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"VHDX image", type:"vhdx" }, { title:"VMDK image", type:"vmdk" }, { title:"VDI image", type:"vdi" }, { title:"VirtualPC image", type:"vhd" }, { title:"Raw disk image", type:"img" }, { title:"OVA template", type:"ova" } ] },
                        { title:"ARM64 / AMPERE", arch:"arm64", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"VHDX image", type:"vhdx" }, { title:"VMDK image", type:"vmdk" }, { title:"VDI image", type:"vdi" }, { title:"VirtualPC image", type:"vhd" }, { title:"Raw disk image", type:"img" } ] }
@@ -709,8 +709,8 @@

            // Generate version selection buttons
            versionBtnsContainer.innerHTML = `
+                <button data-version="${routeros7_longterm}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v7 Long-Term</button>
                <button data-version="${routeros7_stable}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v7 Stable</button>
-                <button data-version="${routeros7_testing}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v7 Testing</button>
                <button data-version="${routeros6_longterm}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v6 Long-Term</button>
                <button data-version="${routeros6_stable}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v6 Stable</button>
            `;
--- a/keygen/keygen_arm64
+++ b/keygen/keygen_arm64
--- a/keygen/keygen_x86
+++ b/keygen/keygen_x86
Author	SHA1	Message	Date
elseif	a988945f52	update keygen	2026-08-26 01:34:39 +08:00
elseif	e94750a0d8	update keygen	2026-08-25 21:21:44 +08:00
elseif	489427c34f	use musl-toolchain compile busybox	2026-08-25 19:48:01 +08:00
elseif	f7a2316049	Merge branch 'main' of github.com:elseif/MikroTikPatch	2026-08-25 17:22:51 +08:00
elseif	7410c6dc6b	modified: .github/workflows/build_docker.yml modified: index.html	2026-08-25 17:22:35 +08:00
elseif	fc1d950da6	Update patch_v7.yml Signed-off-by: elseif <elseif@live.cn>	2026-08-21 19:00:54 +08:00
elseif	622ba70c2a	Update patch_v7.yml Signed-off-by: elseif <elseif@live.cn>	2026-08-21 17:42:56 +08:00
elseif	4761e53917	Update main.yml Signed-off-by: elseif <elseif@live.cn>	2026-08-21 17:40:18 +08:00
elseif	74a6a9c8dd	modified: .github/workflows/build_docker.yml	2026-08-05 01:39:42 +08:00
elseif	e29a43041c	modified: .github/workflows/build_docker.yml	2026-08-05 01:36:43 +08:00
elseif	3dc5e43434	modified: .github/workflows/build_docker.yml	2026-08-05 01:21:20 +08:00