Correct workflows

loskiq · Jan 11, 2025 · bc541a5 · bc541a5
1 parent 0b79aa5
commit bc541a5
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/.github/workflows/patch6.yml b/.github/workflows/patch6.yml
@@ -100,20 +100,20 @@ jobs:
         sudo zip ../all_packages-x86-$LATEST_VERSION-patched.zip *.npk
         cd ..
 
-    - name: Cache install-image-${{ env.LATEST_VERSION }}
+    - name: Cache install-image-${{ env.LATEST_VERSION }}.zip
       if: steps.get_latest.outputs.has_new_version == 'true'
       id: cache_install_image
       uses: actions/cache@v4
       with:
         path: install-image.zip
         key: install-image-${{ env.LATEST_VERSION }}-x86
 
-    - name: Get install-image-${{ env.LATEST_VERSION }}
+    - name: Get install-image-${{ env.LATEST_VERSION }}.zip
       if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache_install_image.outputs.cache-hit != 'true'
       run: |
           sudo curl -s -o install-image.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/install-image-$LATEST_VERSION.zip
 
-    - name: Patch install-image-${{ env.LATEST_VERSION }}
+    - name: Patch install-image-${{ env.LATEST_VERSION }}.img
       if: steps.get_latest.outputs.has_new_version == 'true'
       run: |
         sudo apt-get install -y qemu-utils extlinux > /dev/null
@@ -155,20 +155,20 @@ jobs:
         sudo rm install-image-$LATEST_VERSION-patched.vdi
         sudo rm install-image-$LATEST_VERSION-patched.img
 
-    - name: Cache chr-${{ env.LATEST_VERSION }}
+    - name: Cache chr-${{ env.LATEST_VERSION }}.zip
       if: steps.get_latest.outputs.has_new_version == 'true'
       id: cache_chr_img
       uses: actions/cache@v4
       with:
         path: chr.img.zip
         key: chr-${{ env.LATEST_VERSION }}-x86
 
-    - name: Get chr-${{ env.LATEST_VERSION }}
+    - name: Get chr-${{ env.LATEST_VERSION }}.zip
       if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache_chr_img.outputs.cache-hit != 'true'
       run: |
           sudo curl -s -o chr.img.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/chr-$LATEST_VERSION.img.zip
 
-    - name: Patch chr-${{ env.LATEST_VERSION }}
+    - name: Patch chr-${{ env.LATEST_VERSION }}.img
       if: steps.get_latest.outputs.has_new_version == 'true'
       run: |
         sudo apt-get install -y qemu-utils extlinux > /dev/null

diff --git a/.github/workflows/patch7.yml b/.github/workflows/patch7.yml
@@ -98,7 +98,7 @@ jobs:
         sudo cp ./new_iso/routeros-$LATEST_VERSION*.npk ./routeros-$LATEST_VERSION$ARCH-patched.npk
         NPK_FILES=$(find ./new_iso/*.npk)
         for file in $NPK_FILES; do
-            sudo -E python3 npk.py sign $file $file
+          sudo -E python3 npk.py sign $file $file
         done
         sudo mkdir ./efiboot
         sudo mount -o loop ./new_iso/efiboot.img ./efiboot
@@ -108,32 +108,32 @@ jobs:
           sudo cp ./BOOTX64.EFI ./new_iso/isolinux/linux
           sudo umount ./efiboot
           sudo mkisofs -o mikrotik-$LATEST_VERSION$ARCH-patched.iso \
-                      -V "MikroTik $LATEST_VERSION $ARCH" \
-                      -sysid "" -preparer "MiKroTiK" \
-                      -publisher "" -A "MiKroTiK RouterOS" \
-                      -input-charset utf-8 \
-                      -b isolinux/isolinux.bin \
-                      -c isolinux/boot.cat \
-                      -no-emul-boot \
-                      -boot-load-size 4 \
-                      -boot-info-table \
-                      -eltorito-alt-boot \
-                      -e efiboot.img \
-                      -no-emul-boot \
-                      -R -J \
-                      ./new_iso
+                       -V "MikroTik $LATEST_VERSION $ARCH" \
+                       -sysid "" -preparer "MiKroTiK" \
+                       -publisher "" -A "MiKroTiK RouterOS" \
+                       -input-charset utf-8 \
+                       -b isolinux/isolinux.bin \
+                       -c isolinux/boot.cat \
+                       -no-emul-boot \
+                       -boot-load-size 4 \
+                       -boot-info-table \
+                       -eltorito-alt-boot \
+                       -e efiboot.img \
+                       -no-emul-boot \
+                       -R -J \
+                       ./new_iso
         elif [ "${{ matrix.arch }}" == "arm64" ]; then
           sudo -E python3 patch.py kernel ./efiboot/EFI/BOOT/BOOTAA64.EFI
           sudo umount ./efiboot
           sudo xorriso -as mkisofs -o mikrotik-$LATEST_VERSION$ARCH-patched.iso \
-                      -V "MikroTik $LATEST_VERSION ${{ matrix.arch }}" \
-                      -sysid "" -preparer "MiKroTiK" \
-                      -publisher "" -A "MiKroTiK RouterOS" \
-                      -input-charset utf-8 \
-                      -b efiboot.img \
-                      -no-emul-boot \
-                      -R -J \
-                      ./new_iso
+                       -V "MikroTik $LATEST_VERSION ${{ matrix.arch }}" \
+                       -sysid "" -preparer "MiKroTiK" \
+                       -publisher "" -A "MiKroTiK RouterOS" \
+                       -input-charset utf-8 \
+                       -b efiboot.img \
+                       -no-emul-boot \
+                       -R -J \
+                       ./new_iso
         fi
         sudo rm -rf ./efiboot
         sudo mkdir ./all_packages_iso$ARCH-$LATEST_VERSION
@@ -155,20 +155,20 @@ jobs:
       if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache_refind.outputs.cache-hit != 'true' && matrix.arch == 'x86'
       run: sudo curl -s -o refind-bin-0.14.2.zip https://nchc.dl.sourceforge.net/project/refind/0.14.2/refind-bin-0.14.2.zip
 
-    - name: Cache install-image-${{ env.LATEST_VERSION }}${{ env.ARCH }}
+    - name: Cache install-image-${{ env.LATEST_VERSION }}${{ env.ARCH }}.zip
       if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86'
       id: cache_install_image
       uses: actions/cache@v4
       with:
         path: install-image.zip
         key: install-image-${{ env.LATEST_VERSION }}-${{ matrix.arch }}
 
-    - name: Get install-image-${{ env.LATEST_VERSION }}${{ env.ARCH }}
+    - name: Get install-image-${{ env.LATEST_VERSION }}${{ env.ARCH }}.zip
       if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache_install_image.outputs.cache-hit != 'true' && matrix.arch == 'x86'
       run: |
-          sudo curl -s -o install-image.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/install-image-$LATEST_VERSION.zip
+        sudo curl -s -o install-image.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/install-image-$LATEST_VERSION.zip
 
-    - name: Patch install-image-${{ env.LATEST_VERSION }}${{ env.ARCH }}
+    - name: Patch install-image-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img
       if: steps.get_latest.outputs.has_new_version == 'true' && matrix.arch == 'x86'
       run: |
         sudo apt-get install -y qemu-utils extlinux > /dev/null
@@ -185,7 +185,7 @@ jobs:
         NPK_FILES=($(find ./all_packages_iso$ARCH-$LATEST_VERSION/*.npk))
         for ((i=1; i<=${#NPK_FILES[@]}; i++))
         do
-          echo "${NPK_FILES[$i-1]}=>$i.npk" 
+          echo "${NPK_FILES[$i-1]}=>$i.npk"
           sudo cp ${NPK_FILES[$i-1]} ./install/$i.npk
         done
         sudo umount /dev/nbd0
@@ -213,20 +213,20 @@ jobs:
         sudo rm install-image-$LATEST_VERSION$ARCH-patched.vdi
         sudo rm install-image-$LATEST_VERSION$ARCH-patched.img
 
-    - name: Cache chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}
+    - name: Cache chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}.zip
       if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
       id: cache_chr_img
       uses: actions/cache@v4
       with:
         path: chr.img.zip
         key: chr-${{ env.LATEST_VERSION }}-${{ matrix.arch }}
 
-    - name: Get chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}
+    - name: Get chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}.zip
       if: steps.get_latest.outputs.has_new_version == 'true' && steps.cache_chr_img.outputs.cache-hit != 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
       run: |
         sudo curl -s -o chr.img.zip https://download.mikrotik.com/routeros/$LATEST_VERSION/chr-$LATEST_VERSION$ARCH.img.zip
 
-    - name: Patch chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}
+    - name: Patch chr-${{ env.LATEST_VERSION }}${{ env.ARCH }}.img
       if: steps.get_latest.outputs.has_new_version == 'true' && (matrix.arch == 'x86' || matrix.arch == 'arm64')
       run: |
         sudo apt-get install -y qemu-utils extlinux > /dev/null