From a6a5752cdf0f640fa22b908b65f94c8a7fb98e09 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 26 May 2025 17:13:39 +0200 Subject: [PATCH] ci: release-emu.yml: fix model handling (cherry picked from commit 1f697ace50420a64ce42abb7b55fec52b9e8d66b) --- .github/workflows/release-emu.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-emu.yml b/.github/workflows/release-emu.yml index ab424e2773..f0cec6cca0 100644 --- a/.github/workflows/release-emu.yml +++ b/.github/workflows/release-emu.yml @@ -25,13 +25,14 @@ jobs: run: | if [[ $GITHUB_REF == refs/tags/core/* ]]; then VERSION=${GITHUB_REF#refs/tags/core/v} - MODELS=$(jq -r --arg version "$VERSION" '.firmware[$version] | join(",")' ./common/releases.json) + MODELS=$(jq -cr --arg version "$VERSION" '.firmware[$version]' ./common/releases.json) elif [[ $GITHUB_REF == refs/tags/legacy/* ]]; then VERSION=${GITHUB_REF#refs/tags/legacy/v} - MODELS=$(jq -r --arg version "$VERSION" '.firmware[$version] | join(",")' ./common/releases.json) + MODELS=$(jq -cr --arg version "$VERSION" '.firmware[$version]' ./common/releases.json) fi echo "models=$MODELS" >> $GITHUB_OUTPUT echo "version=$VERSION" >> $GITHUB_OUTPUT + cat $GITHUB_OUTPUT core_emu: if: startsWith(github.ref, 'refs/tags/core/v') @@ -127,7 +128,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: core-emu-${{ matrix.model }}-${{ matrix.coins }}-${{ matrix.type }}-${{ matrix.asan }} + name: core-emu-arm-${{ matrix.model }}-${{ matrix.coins }}-${{ matrix.type }}-${{ matrix.asan }} path: | core/build/unix/trezor-emu-core* core/build/bootloader_emu/bootloader.elf