modified: .github/workflows/main.yml

2026-09-04 06:25:47 +00:00 · 2026-09-03 21:20:45 +08:00 · 2026-09-03 20:26:08 +08:00 · 2026-09-03 20:25:32 +08:00 · 2026-09-03 20:09:47 +08:00 · 2026-09-03 20:05:46 +08:00
1 changed files with 57 additions and 52 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,7 +2,7 @@
 name: Patch Mikrotik RouterOS
 on:
  schedule:
-    - cron: "00 09 * * *"   # At UTC 09:00 (Beijing 17:00) on every day
+    - cron: "25 * * * *"   # Every hour at minute 25 (UTC)
  workflow_dispatch:  
    inputs:
      version:
@@ -26,25 +26,22 @@ jobs:
    outputs:
      upgrades_v6: ${{ steps.set-matrix.outputs.upgrades_v6 }}
      upgrades_v7: ${{ steps.set-matrix.outputs.upgrades_v7 }}
+      patch_v6: ${{ steps.set-matrix.outputs.patch_v6 }}
+      patch_v7: ${{ steps.set-matrix.outputs.patch_v7 }}
    steps:
      - name: Fetch and compare versions
        id: set-matrix
        run: |
          OFFICIAL_UPGRADE=$(curl -s https://upgrade.mikrotik.com/routeros/upgrade.json)
          echo "$OFFICIAL_UPGRADE" | jq -e . >/dev/null 2>&1 || { echo "ERROR: OFFICIAL_UPGRADE is not valid JSON" >&2; exit 1; }
-          echo "=== OFFICIAL_UPGRADE ==="
-          echo "$OFFICIAL_UPGRADE" | jq .

-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+          if [[ "${{ github.event_name }}" != "workflow_dispatch" ]]; then
            PATCH_UPGRADE=$(curl -s https://upgrade.mikrotik.ltd/routeros/upgrade.json)
            echo "$PATCH_UPGRADE" | jq -e . >/dev/null 2>&1 || { echo "ERROR: PATCH_UPGRADE is not valid JSON" >&2; exit 1; }
-            echo "=== PATCH_UPGRADE ==="
-            echo "$PATCH_UPGRADE" | jq .

            CANDIDATES=$(echo "$OFFICIAL_UPGRADE" | jq -c --argjson patch "$PATCH_UPGRADE" '
              ($patch.upgradePaths // {}) as $paths |
-              .upgradePaths // {} |
-              to_entries |
+              .upgradePaths // {} | to_entries |
              map(
                .value.version as $official_version |
                ($paths[.key] // null) as $patch_value |
@@ -52,10 +49,11 @@ jobs:
                  $patch_value != null and
                  $official_version != $patch_value.version and
                  (any($paths[]; .version == $official_version) | not) and
-                  (.key | test("^NEWEST6|^NEWESTa7"))
+                  ((.key | test("^NEWEST6")) or (.key | test("^NEWESTa7"))) and 
+                  (.key | test("\\.(stable|development|long-term)$"))
                ) |
                {
-                  majorVersion: (if .key | test("^NEWESTa7") then "7" else "6" end),
+                  majorVersion: (.value.version | split(".")[0]),
                  channel: (.key | split(".")[1]),
                  version: .value.version
                }
@@ -63,59 +61,66 @@ jobs:
            ')
          else
            CANDIDATES=$(echo "$OFFICIAL_UPGRADE" | jq -c '
-              .upgradePaths // {}| to_entries | 
+              .upgradePaths // {} | to_entries | 
              map(
-                  select((.key | test("^NEWEST6")) or (.key | test("^NEWESTa7"))) |
-                  {
-                    majorVersion: (if (.key | test("^NEWESTa7"))  then "7" else "6"  end),
-                    channel: (.key | split(".")[1]),
-                    version: .value.version
-                  }
+                select(
+                  ((.key | test("^NEWEST6")) or (.key | test("^NEWESTa7")))
+                  and
+                  (.key | test("\\.(stable|development|long-term)$"))
                )
+                |
+                {
+                  majorVersion: (.value.version | split(".")[0]),
+                  channel: (.key | split(".")[1]),
+                  version: .value.version
+                }
+              )
            ')
          fi

          VERSION_FILTER="${{ inputs.version || 'all' }}"
+          V6_MATRIX=$(echo "$CANDIDATES" | jq -c 'map(select(.majorVersion == "6" ))')
+          V7_MATRIX=$(echo "$CANDIDATES" | jq -c 'map(select(.majorVersion == "7" ))')
          if [[ "$VERSION_FILTER" == "v6" ]]; then
-            V6_MATRIX=$(echo "$CANDIDATES" | jq -c 'map(select(.majorVersion == "6"))')
            V7_MATRIX='[]'
          elif [[ "$VERSION_FILTER" == "v7" ]]; then
            V6_MATRIX='[]'
-            V7_MATRIX=$(echo "$CANDIDATES" | jq -c 'map(select(.majorVersion == "7"))')
-          else
-            V6_MATRIX=$(echo "$CANDIDATES" | jq -c 'map(select(.majorVersion == "6"))')
-            V7_MATRIX=$(echo "$CANDIDATES" | jq -c 'map(select(.majorVersion == "7"))')
          fi
+          echo "upgrades_v6=$V6_MATRIX" >> "$GITHUB_OUTPUT"
+          echo "upgrades_v7=$V7_MATRIX" >> "$GITHUB_OUTPUT"
+          echo "patch_v6=$(jq 'length > 0' <<< "$V6_MATRIX")" >> "$GITHUB_OUTPUT"
+          echo "patch_v7=$(jq 'length > 0' <<< "$V7_MATRIX")" >> "$GITHUB_OUTPUT"

-          echo "upgrades_v6=$V6_MATRIX" >> $GITHUB_OUTPUT
-          echo "upgrades_v7=$V7_MATRIX" >> $GITHUB_OUTPUT
-          echo "Upgrades V6: $V6_MATRIX"
-          echo "Upgrades V7: $V7_MATRIX"
+          echo "=== Upgrades V6 ==="
+          echo "$V6_MATRIX" | jq .

-  # Patch_V6:
-  #   needs: Check_Versions
-  #   if: ${{ needs.Check_Versions.outputs.upgrades_v6 != '[]' }}
-  #   uses: ./.github/workflows/patch_v6.yml
-  #   strategy:
-  #     matrix:
-  #       target: ${{ fromJson(needs.Check_Versions.outputs.upgrades_v6) }}
-  #     fail-fast: false
-  #   with:
-  #     channel: ${{ matrix.target.channel }}
-  #     version: ${{ matrix.target.version }}
-  #     release: ${{ github.event_name == 'workflow_dispatch' && inputs.release || github.event_name != 'workflow_dispatch' && true }}
-  #   secrets: inherit
+          echo "=== Upgrades V7 ==="
+          echo "$V7_MATRIX" | jq .

-  # Patch_V7:
-  #   needs: Check_Versions
-  #   if: ${{ needs.Check_Versions.outputs.upgrades_v7 != '[]' }}
-  #   uses: ./.github/workflows/patch_v7.yml
-  #   strategy:
-  #     matrix:
-  #       target: ${{ fromJson(needs.Check_Versions.outputs.upgrades_v7) }}
-  #     fail-fast: false
-  #   with:
-  #     channel: ${{ matrix.target.channel }}
-  #     version: ${{ matrix.target.version }}
-  #     release: ${{ github.event_name == 'workflow_dispatch' && inputs.release || github.event_name != 'workflow_dispatch' && true }}
-  #   secrets: inherit
+  Patch_V6:
+    needs: Check_Versions
+    if: ${{ needs.Check_Versions.outputs.patch_v6 == 'true' }}
+    uses: ./.github/workflows/patch_v6.yml
+    strategy:
+      matrix:
+        target: ${{ fromJson(needs.Check_Versions.outputs.upgrades_v6) }}
+      fail-fast: false
+    with:
+      channel: ${{ matrix.target.channel }}
+      version: ${{ matrix.target.version }}
+      release: ${{ github.event_name != 'workflow_dispatch' || inputs.release }}
+    secrets: inherit
+
+  Patch_V7:
+    needs: Check_Versions
+    if: ${{ needs.Check_Versions.outputs.patch_v7 == 'true' }}
+    uses: ./.github/workflows/patch_v7.yml
+    strategy:
+      matrix:
+        target: ${{ fromJson(needs.Check_Versions.outputs.upgrades_v7) }}
+      fail-fast: false
+    with:
+      channel: ${{ matrix.target.channel }}
+      version: ${{ matrix.target.version }}
+      release: ${{ github.event_name != 'workflow_dispatch' || inputs.release }}
+    secrets: inherit
Author	SHA1	Message	Date
elseif	8162e48464	modified: .github/workflows/main.yml	2026-09-03 21:20:45 +08:00
elseif	fec8972b11	modified: .github/workflows/main.yml	2026-09-03 20:26:08 +08:00
elseif	6307abfa84	modified: .github/workflows/main.yml	2026-09-03 20:25:32 +08:00
elseif	777f09760b	modified: .github/workflows/main.yml	2026-09-03 20:09:47 +08:00
elseif	da9a657837	modified: .github/workflows/main.yml	2026-09-03 20:05:46 +08:00
elseif	a925bfaa51	modified: .github/workflows/main.yml	2026-09-03 19:57:16 +08:00
elseif	41e23585ef	modified: .github/workflows/main.yml	2026-09-03 19:54:49 +08:00
elseif	778e0adc1d	modified: .github/workflows/main.yml	2026-09-03 19:52:18 +08:00
elseif	e9d87975ac	modified: .github/workflows/main.yml	2026-09-03 19:51:38 +08:00
elseif	82febfa6ae	modified: .github/workflows/main.yml	2026-09-03 19:50:27 +08:00
elseif	4a4c226a47	modified: .github/workflows/main.yml	2026-09-03 19:49:09 +08:00