From 049c4b91e500141bbd7fe415fd9ceda32b9aea96 Mon Sep 17 00:00:00 2001 From: zyb Date: Mon, 24 Jun 2024 09:50:31 +0800 Subject: [PATCH] modified: .github/workflows/mikrotik_patch.yml modified: patch.py --- .github/workflows/mikrotik_patch.yml | 8 +++++++- patch.py | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mikrotik_patch.yml b/.github/workflows/mikrotik_patch.yml index 3377d1a..3d22d09 100644 --- a/.github/workflows/mikrotik_patch.yml +++ b/.github/workflows/mikrotik_patch.yml @@ -152,6 +152,9 @@ jobs: -no-emul-boot \ -R -J \ ./new_iso + cd ./new_iso + sudo zip ../all_packages-x86-$LATEST_VERSION.zip *.npk + cd .. sudo rm -rf ./new_iso - name: Create chr-${{ env.LATEST_VERSION }}.img @@ -275,4 +278,7 @@ jobs: mikrotik-${{ env.LATEST_VERSION }}.iso chr-${{ env.LATEST_VERSION }}*.zip netinstall-${{ env.LATEST_VERSION }}.zip - install-image-${{ env.LATEST_VERSION }}.zip \ No newline at end of file + install-image-${{ env.LATEST_VERSION }}.zip + routeros-$LATEST_VERSION.npk + option-$LATEST_VERSION.npk + all_packages-x86-$LATEST_VERSION.zip \ No newline at end of file diff --git a/patch.py b/patch.py index 9be6fa2..dd17fbf 100644 --- a/patch.py +++ b/patch.py @@ -45,7 +45,6 @@ def run_shell_command(command): process = subprocess.run(command, shell=True, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) return process.stdout, process.stderr - def patch_squashfs(path,key_dict): for root, dirs, files in os.walk(path): for file in files: