From a925bfaa51ad6f970772baa841520a4e85bbbcd2 Mon Sep 17 00:00:00 2001 From: elseif Date: Thu, 3 Sep 2026 19:57:16 +0800 Subject: [PATCH] modified: .github/workflows/main.yml --- .github/workflows/main.yml | 59 ++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cbfebc3..3c9ccba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,33 +86,36 @@ jobs: fi echo "upgrades_v6=$V6_MATRIX" >> $GITHUB_OUTPUT echo "upgrades_v7=$V7_MATRIX" >> $GITHUB_OUTPUT - echo "Upgrades V6: $V6_MATRIX" - echo "Upgrades V7: $V7_MATRIX" + echo "=== Upgrades V6 ===" + echo "$V6_MATRIX" | jq . - # Patch_V6: - # needs: Check_Versions - # if: ${{ needs.Check_Versions.outputs.upgrades_v6 != '[]' }} - # uses: ./.github/workflows/patch_v6.yml - # strategy: - # matrix: - # target: ${{ fromJson(needs.Check_Versions.outputs.upgrades_v6) }} - # fail-fast: false - # with: - # channel: ${{ matrix.target.channel }} - # version: ${{ matrix.target.version }} - # release: ${{ github.event_name == 'workflow_dispatch' && inputs.release || github.event_name != 'workflow_dispatch' && true }} - # secrets: inherit + echo "=== Upgrades V7 ===" + echo "$V7_MATRIX" | jq . - # Patch_V7: - # needs: Check_Versions - # if: ${{ needs.Check_Versions.outputs.upgrades_v7 != '[]' }} - # uses: ./.github/workflows/patch_v7.yml - # strategy: - # matrix: - # target: ${{ fromJson(needs.Check_Versions.outputs.upgrades_v7) }} - # fail-fast: false - # with: - # channel: ${{ matrix.target.channel }} - # version: ${{ matrix.target.version }} - # release: ${{ github.event_name == 'workflow_dispatch' && inputs.release || github.event_name != 'workflow_dispatch' && true }} - # secrets: inherit \ No newline at end of file + Patch_V6: + needs: Check_Versions + if: ${{ needs.Check_Versions.outputs.upgrades_v6 != '[]' }} + uses: ./.github/workflows/patch_v6.yml + strategy: + matrix: + target: ${{ fromJson(needs.Check_Versions.outputs.upgrades_v6) }} + fail-fast: false + with: + channel: ${{ matrix.target.channel }} + version: ${{ matrix.target.version }} + release: ${{ github.event_name == 'workflow_dispatch' && inputs.release || github.event_name != 'workflow_dispatch' && true }} + secrets: inherit + + Patch_V7: + needs: Check_Versions + if: ${{ needs.Check_Versions.outputs.upgrades_v7 != '[]' }} + uses: ./.github/workflows/patch_v7.yml + strategy: + matrix: + target: ${{ fromJson(needs.Check_Versions.outputs.upgrades_v7) }} + fail-fast: false + with: + channel: ${{ matrix.target.channel }} + version: ${{ matrix.target.version }} + release: ${{ github.event_name == 'workflow_dispatch' && inputs.release || github.event_name != 'workflow_dispatch' && true }} + secrets: inherit \ No newline at end of file