modified: .github/workflows/mikrotik_patch.yml

.github/workflows/mikrotik_patch.yml

@@ -10,37 +10,11 @@ permissions:
   contents: write
 
 jobs:
-  Patch_Mikrotik_RouterOS:
+  Create_SquashFS:
     runs-on: ubuntu-latest
     env:
       TZ: 'Asia/Shanghai'
-      LATEST_STABLE_VERSION_URL: 'https://upgrade.mikrotik.com/routeros/NEWESTa7.stable'
-      LATEST_VERSION: "7.15"
-      CUSTOM_LICENSE_PRIVATE_KEY: ${{ secrets.CUSTOM_LICENSE_PRIVATE_KEY }}
-      CUSTOM_LICENSE_PUBLIC_KEY: ${{ secrets.CUSTOM_LICENSE_PUBLIC_KEY }}
-      CUSTOM_NPK_SIGN_PRIVATE_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PRIVATE_KEY }}
-      CUSTOM_NPK_SIGN_PUBLIC_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PUBLIC_KEY }}
-      MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }}
-      MIKRO_NPK_SIGN_PUBLIC_LKEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_LKEY }}
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-        
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.11' 
-    - name: Get latest routeros stable version  
-      run: |
-        echo $(uname -a)
-        LATEST_VERSION=$(wget -nv -O - $LATEST_STABLE_VERSION_URL | cut -d ' ' -f1)
-        echo Latest Stabel Version:$LATEST_VERSION
-        echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_ENV
-
-    - name: Create keygen 
-      run: |
-       zip keygen.zip ./keygen.exe
-
       - name: Create squashfs for option npk        
         run: |
           cd $GITHUB_WORKSPACE
@@ -67,7 +41,7 @@ jobs:
           sudo mkdir -p /pckg/python3/
           cd Python-3.11.9
           sudo apt install -y pkg-config libbz2-dev liblzma-dev libssl-dev libgd-dev libreadline-dev zlib1g-dev libgdbm-dev
-        ./configure --enable-optimizations --prefix=/pckg/python3/ --disable-test-modules --without-static-libpython CONFIGURE_LDFLAGS="-static" 
+          ./configure --enable-optimizations --prefix=/pckg/python3/ --disable-test-modules --without-static-libpython CONFIGURE_LDFLAGS="-static" PY_CORE_LDFLAGS="-static" 
           make -j$(nproc)
           sudo make altinstall
           cd ..
@@ -77,6 +51,54 @@ jobs:
           sudo mksquashfs /pckg/python3 python3.sfs -quiet -comp xz -no-xattrs -b 256k
           sudo rm -rf /pckg
 
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 1
+          name: squashfs
+          path: |
+            ./option.sfs
+            ./python3.sfs
+
+  Patch_Mikrotik_RouterOS:
+    runs-on: ubuntu-latest
+    needs: Create_SquashFS
+    env:
+      TZ: 'Asia/Shanghai'
+      LATEST_STABLE_VERSION_URL: 'https://upgrade.mikrotik.com/routeros/NEWESTa7.stable'
+      LATEST_VERSION: "7.15"
+      CUSTOM_LICENSE_PRIVATE_KEY: ${{ secrets.CUSTOM_LICENSE_PRIVATE_KEY }}
+      CUSTOM_LICENSE_PUBLIC_KEY: ${{ secrets.CUSTOM_LICENSE_PUBLIC_KEY }}
+      CUSTOM_NPK_SIGN_PRIVATE_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PRIVATE_KEY }}
+      CUSTOM_NPK_SIGN_PUBLIC_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PUBLIC_KEY }}
+      MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }}
+      MIKRO_NPK_SIGN_PUBLIC_LKEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_LKEY }}
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+        
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11' 
+
+    - name: Download Artifact
+      uses: actions/download-artifact@v4
+      with:
+        name: squashfs
+
+    - name: Get latest routeros stable version  
+      run: |
+        run: ls -R
+        echo $(uname -a)
+        LATEST_VERSION=$(wget -nv -O - $LATEST_STABLE_VERSION_URL | cut -d ' ' -f1)
+        echo Latest Stabel Version:$LATEST_VERSION
+        echo "LATEST_VERSION=${LATEST_VERSION}" >> $GITHUB_ENV
+
+    - name: Create keygen 
+      run: |
+       zip keygen.zip ./keygen.exe
+          
     - name: Get mikrotik-${{ env.LATEST_VERSION }}.iso
       run: |
         sudo wget -nv -O mikrotik-$LATEST_VERSION.iso https://download.mikrotik.com/routeros/$LATEST_VERSION/mikrotik-$LATEST_VERSION.iso