From e6462f2f033f8c148713dae62b46aa4106134772 Mon Sep 17 00:00:00 2001 From: elseif Date: Fri, 4 Sep 2026 16:08:42 +0800 Subject: [PATCH] modified: .github/workflows/main.yml modified: .github/workflows/patch_v6.yml modified: .github/workflows/patch_v7.yml --- .github/workflows/main.yml | 1 + .github/workflows/patch_v6.yml | 17 ++++++++++++----- .github/workflows/patch_v7.yml | 10 +++++----- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8b40ce0..26b5ac5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -230,6 +230,7 @@ jobs: with: version: ${{ matrix.target.version }} channels: ${{ toJson(matrix.target.channels) }} + archs: ${{ needs.Prepare_Patch.outputs.archs }} buildtime: ${{ inputs.buildtime }} release: ${{ github.event_name != 'workflow_dispatch' || inputs.release }} secrets: inherit diff --git a/.github/workflows/patch_v6.yml b/.github/workflows/patch_v6.yml index 603a676..ce62aca 100644 --- a/.github/workflows/patch_v6.yml +++ b/.github/workflows/patch_v6.yml @@ -2,17 +2,20 @@ name: Patch RouterOS v6 on: workflow_call: inputs: + version: + required: true + type: string channels: required: true type: string - version: - required: false + archs: + required: true type: string buildtime: - required: false + required: true type: string release: - required: false + required: true type: boolean env: @@ -38,10 +41,14 @@ env: jobs: Patch_RouterOS: runs-on: ubuntu-24.04 + strategy: + matrix: + arch: ${{ fromJson( inputs.archs ) }} + fail-fast: false env: TZ: 'Asia/Shanghai' CHANNELS: ${{ inputs.channels }} - ARCH: "x86" + ARCH: ${{ matrix.arch }} VERSION: ${{ inputs.version }} BUILD_TIME: ${{ inputs.buildtime }} RELEASE: ${{ inputs.release }} diff --git a/.github/workflows/patch_v7.yml b/.github/workflows/patch_v7.yml index 804d30a..e19ec94 100644 --- a/.github/workflows/patch_v7.yml +++ b/.github/workflows/patch_v7.yml @@ -2,20 +2,20 @@ name: Patch RouterOS v7 on: workflow_call: inputs: + version: + required: true + type: string channels: required: true type: string archs: required: true type: string - version: - required: false - type: string buildtime: - required: false + required: true type: string release: - required: false + required: true type: boolean env: