From 0042a0b550b22e208340d2a3c3c40faf72c345fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Wed, 15 Jun 2022 00:27:01 +0200 Subject: [PATCH] fix printing of subtargets --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 499b4cfe5..0e258f565 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,9 +117,9 @@ jobs: matrix="$(yq --output-format json <<< "${matrix}")" fi - jq -C <<< "${matrix}" + jq -C '[.[] | . += {"pretty": ([.target] + [select(.sub != null).sub]) | join(":")}]' <<< "${matrix}" - echo "::set-output name=matrix::$(jq -c <<< "${matrix}")" + echo "::set-output name=matrix::$(jq -c '[.[] | . += {"pretty": ([.target] + [select(.sub != null).sub]) | join(":")}]' <<< "${matrix}")" env: commit_message: > ${{ @@ -190,7 +190,7 @@ jobs: - { target: thumbv7m-none-eabi, os: ubuntu-latest, std: 1 } docker-image: - name: docker-image (${{ matrix.target }}) + name: docker-image (${{ matrix.pretty }}) runs-on: ${{ matrix.os }} needs: [shellcheck, test, generate-matrix] if: github.event_name == 'push'