From 4d32f80f8b9a8e736b727094acad4bd7789b61ea Mon Sep 17 00:00:00 2001 From: elseif Date: Thu, 16 Jul 2026 13:19:44 +0800 Subject: [PATCH] modified: .github/workflows/build_docker.yml --- .github/workflows/build_docker.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index 74110a3..90508e4 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -19,13 +19,13 @@ jobs: - name: Get versions and generate matrix id: get_versions run: | - SPECIFIED_VERSION="${{ inputs.version }}" - if [ -n "$SPECIFIED_VERSION" ]; then + VERSION="${{ inputs.version }}" + if [ -n "$VERSION" ]; then MATRIX=$(jq -c -n ' [ - { "name": "specified", "version": $SPECIFIED_VERSION, "channel": "specified"} + { "version": $VERSION, "channel": ""} ] - ' --arg SPECIFIED_VERSION "$SPECIFIED_VERSION") + ' --arg VERSION "$VERSION") else TIMESTAMP=$(date +%s) LONG_TERM=$(wget -nv -O - "https://upgrade.mikrotik.ltd/routeros/NEWESTa7.long-term?t=$TIMESTAMP" | cut -d ' ' -f1) @@ -43,8 +43,8 @@ jobs: fi MATRIX=$(jq -c -n ' [ - {name: "long-term", version: $LONG_TERM, channel: "long-term"}, - {name: "stable", version: $STABLE, channel: "stable"} + {version: $LONG_TERM, channel: "long-term"}, + {version: $STABLE, channel: "stable"} ] ' --arg LONG_TERM "$LONG_TERM" --arg STABLE "$STABLE") fi @@ -70,7 +70,6 @@ jobs: steps: - name: Show build info run: | - echo "Building: ${{ matrix.name }}" echo "Version: ${{ env.VERSION }}" echo "Channel: ${{ env.CHANNEL }}" @@ -214,7 +213,7 @@ jobs: sbom: false - name: Update channel tags - if: matrix.name != 'specified' + if: env.CHANNEL != '' run: | TAGS="-t ${{ env.IMAGE }}:${{ env.CHANNEL }}" if [ "${{ env.CHANNEL }}" = "stable" ]; then