From 778e0adc1d82056ac16659626aadf9d5433e5728 Mon Sep 17 00:00:00 2001 From: elseif Date: Thu, 3 Sep 2026 19:52:18 +0800 Subject: [PATCH] modified: .github/workflows/main.yml --- .github/workflows/main.yml | 54 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 36db449..49ec3dd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: OFFICIAL_UPGRADE=$(curl -s https://upgrade.mikrotik.com/routeros/upgrade.json) echo "$OFFICIAL_UPGRADE" | jq -e . >/dev/null 2>&1 || { echo "ERROR: OFFICIAL_UPGRADE is not valid JSON" >&2; exit 1; } - if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then + if [[ "${{ github.event_name }}" != "workflow_dispatch" ]]; then PATCH_UPGRADE=$(curl -s https://upgrade.mikrotik.ltd/routeros/upgrade.json) echo "$PATCH_UPGRADE" | jq -e . >/dev/null 2>&1 || { echo "ERROR: PATCH_UPGRADE is not valid JSON" >&2; exit 1; } @@ -87,30 +87,30 @@ jobs: echo "Upgrades V6: $V6_MATRIX" echo "Upgrades V7: $V7_MATRIX" - 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_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 + # 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