From 3b0e0873ccfa471c9fa724a0eba7b1feeca5df97 Mon Sep 17 00:00:00 2001
From: zyb <elseif@live.cn>
Date: Sat, 13 Jul 2024 22:54:09 +0800
Subject: [PATCH] 	modified:   .github/workflows/mikrotik_patch.yml

---
 .github/workflows/mikrotik_patch.yml | 49 +++++++++++++++-------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/mikrotik_patch.yml b/.github/workflows/mikrotik_patch.yml
index 1a0d905..45e09ad 100644
--- a/.github/workflows/mikrotik_patch.yml
+++ b/.github/workflows/mikrotik_patch.yml
@@ -47,6 +47,32 @@ jobs:
       with:
         python-version: '3.11' 
 
+    - name: Get latest routeros version  
+      run: |
+        echo $(uname -a)
+        LATEST_VERSION=$(wget -nv -O - ${{ env.LATEST_VERSION_URL }}.${{ matrix.channel }} | cut -d ' ' -f1)
+        echo Latest Version:$LATEST_VERSION
+        if [ "${{ github.event_name }}" == "schedule" ]; then
+          _LATEST_VERSION=$(wget -nv -O - https://upgrade.mikrotik.ltd/routeros/NEWESTa7.${{ matrix.channel }} | cut -d ' ' -f1)
+          if [ "$_LATEST_VERSION" == "$LATEST_VERSION" ]; then
+            echo "No new version found"
+            exit 0
+          fi
+        fi
+        BUILD_TIME=$(date +"%s")
+        echo Build Time:$BUILD_TIME
+        wget -nv -O CHANGELOG https://upgrade.mikrotik.com/routeros/$LATEST_VERSION/CHANGELOG
+        cat CHANGELOG
+        echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_ENV
+        echo "BUILD_TIME=${BUILD_TIME}" >> $GITHUB_ENV
+        if [ "${{ matrix.arch }}" == "x86_64" ]; then
+          ARCH=''
+          echo "ARCH=$ARCH" >> $GITHUB_ENV
+        elif [ "${{ matrix.arch }}" == "arm64" ]; then
+          ARCH='-arm64'
+          echo "ARCH=$ARCH" >> $GITHUB_ENV
+        fi
+
     - name: Cache Squashfs
       id: cache-squashfs
       uses: actions/cache@v4
@@ -86,28 +112,7 @@ jobs:
         sudo mksquashfs python python3.sfs -quiet -comp xz -no-xattrs -b 256k
         sudo rm -rf ./python
 
-    - name: Get latest routeros version  
-      run: |
-        echo $(uname -a)
-        if [ "${{ inputs.version }}" == "" ]; then
-          LATEST_VERSION=$(wget -nv -O - ${{ env.LATEST_VERSION_URL }}.${{ matrix.channel }} | cut -d ' ' -f1)
-        else
-          LATEST_VERSION=${{ inputs.version }}
-        fi  
-        BUILD_TIME=$(date +"%s")
-        echo Latest Version:$LATEST_VERSION
-        echo Build Time:$BUILD_TIME
-        wget -nv -O CHANGELOG https://upgrade.mikrotik.com/routeros/$LATEST_VERSION/CHANGELOG
-        cat CHANGELOG
-        echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_ENV
-        echo "BUILD_TIME=${BUILD_TIME}" >> $GITHUB_ENV
-        if [ "${{ matrix.arch }}" == "x86_64" ]; then
-          ARCH=''
-          echo "ARCH=$ARCH" >> $GITHUB_ENV
-        elif [ "${{ matrix.arch }}" == "arm64" ]; then
-          ARCH='-arm64'
-          echo "ARCH=$ARCH" >> $GITHUB_ENV
-        fi
+
 
     - name: Cache NetInstall ${{ env.LATEST_VERSION }}
       if: matrix.arch == 'x86_64'