From 6d68d3767f06b911cdaeecc2f41dca2d72eb648e Mon Sep 17 00:00:00 2001
From: elseif <elseif@live.cn>
Date: Fri, 4 Sep 2026 18:16:44 +0800
Subject: [PATCH] 	modified:   .github/workflows/main.yml 	modified:  
 .github/workflows/patch_v6.yml 	modified:  
 .github/workflows/patch_v7.yml

---
 .github/workflows/main.yml     | 4 ++--
 .github/workflows/patch_v6.yml | 7 ++++---
 .github/workflows/patch_v7.yml | 7 ++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf165bf..338dbea 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -157,8 +157,8 @@ jobs:
                     ]
                   end
                 ] |
-                flatten |
                 map(select(.version != null)) |
+                sort_by(.version) |
                 group_by(.version) |
                 map({
                   version: .[0].version,
@@ -172,7 +172,7 @@ jobs:
           echo "$CANDIDATES" | jq .
 
           if [[ "${{ github.event_name }}" != "workflow_dispatch" ]]; then
-            PATCH_UPGRADE=$(curl -fsSL https://upgrade.mikrotik.ltd/routeros/upgrade.json) || { echo "ERROR: Failed to fetch OFFICIAL_UPGRADE" >&2; exit 1; }
+            PATCH_UPGRADE=$(curl -fsSL https://upgrade.mikrotik.ltd/routeros/upgrade.json) || { echo "ERROR: Failed to fetch PATCH_UPGRADE" >&2; exit 1; }
             echo "$PATCH_UPGRADE" | jq -e . >/dev/null 2>&1 || { echo "ERROR: PATCH_UPGRADE is not valid JSON" >&2; exit 1; }
             PATCH_VERSIONS=$(echo "$PATCH_UPGRADE" |  jq -c '
                 [.upgradePaths[].version] | unique
diff --git a/.github/workflows/patch_v6.yml b/.github/workflows/patch_v6.yml
index ce62aca..25e557f 100644
--- a/.github/workflows/patch_v6.yml
+++ b/.github/workflows/patch_v6.yml
@@ -11,12 +11,13 @@ on:
       archs:
         required: true
         type: string
-      buildtime:
-        required: true
-        type: string
       release:
         required: true
         type: boolean
+      buildtime:
+        required: false
+        type: string
+        default: ''
 
 env:
   CUSTOM_LICENSE_PRIVATE_KEY: ${{ secrets.CUSTOM_LICENSE_PRIVATE_KEY }}
diff --git a/.github/workflows/patch_v7.yml b/.github/workflows/patch_v7.yml
index e19ec94..672703f 100644
--- a/.github/workflows/patch_v7.yml
+++ b/.github/workflows/patch_v7.yml
@@ -11,12 +11,13 @@ on:
       archs:
         required: true
         type: string
-      buildtime:
-        required: true
-        type: string
       release:
         required: true
         type: boolean
+      buildtime:
+        required: false
+        type: string
+        default: ''
 
 env:
   CUSTOM_LICENSE_PRIVATE_KEY: ${{ secrets.CUSTOM_LICENSE_PRIVATE_KEY }}