diff --git a/.ci/get_nonbloom_build_matrix.sh b/.ci/get_nonbloom_build_matrix.sh index 4d45f5b227..3dfec9c738 100755 --- a/.ci/get_nonbloom_build_matrix.sh +++ b/.ci/get_nonbloom_build_matrix.sh @@ -13,31 +13,31 @@ ARCH=$3 YAML_FILE=$LIST.yaml -./.ci_scripts/package_build/add_ros_ppa.sh >> /tmp/log.txt 2>&1 - REPOS=$(./.ci/parse_yaml.py $YAML_FILE $VARIANT $ARCH) -# RESULT='{"matrix": [' -RESULT='[' - FIRST=true +RESULT="[" + +shopt -s lastpipe + # clone and checkout echo "$REPOS" | while IFS= read -r REPO; do PACKAGE=$(echo "$REPO" | awk '{print $1}') + $DEBUG && echo "$PACKAGE" + if $FIRST; then - RESULT=$RESULT\"$PACKAGE\" + RESULT=${RESULT}\"${PACKAGE}\" FIRST=false else - RESULT="$RESULT, \"$PACKAGE\"" + RESULT="${RESULT}, \"${PACKAGE}\"" fi done -# RESULT="$RESULT]}" -RESULT="$RESULT]" +RESULT="${RESULT}]" echo $RESULT diff --git a/.github/workflows/unstable_nonbloom_amd64.yml b/.github/workflows/unstable_nonbloom_amd64.yml index 702ebfa829..ddd430a15c 100644 --- a/.github/workflows/unstable_nonbloom_amd64.yml +++ b/.github/workflows/unstable_nonbloom_amd64.yml @@ -14,10 +14,6 @@ jobs: - id: execute run: | mkdir -p /tmp/artifacts - mkdir -p /tmp/artifacts/metarepositories - touch /tmp/artifacts/generated_thirdparty_amd64.yaml - touch /tmp/artifacts/compiled.txt - echo "0" >> /tmp/artifacts/idx.txt - name: Save artifacts uses: actions/upload-artifact@v3 with: @@ -43,7 +39,7 @@ jobs: token: ${{ secrets.PUSH_TOKEN }} - id: generate run: | - JOB_STRATEGY_MATRIX=$(./.ci/get_nonbloom_build_matrix.sh thirdparty unstable amd64) + JOB_STRATEGY_MATRIX=$(./.ci/get_nonbloom_build_matrix.sh nonbloom unstable amd64) cat /tmp/log.txt echo "packages=$JOB_STRATEGY_MATRIX" >> "$GITHUB_OUTPUT"