Skip to content

Commit

Permalink
updated nonbloom
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Sep 17, 2023
1 parent 00ac295 commit 2d6fe50
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
18 changes: 9 additions & 9 deletions .ci/get_nonbloom_build_matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/unstable_nonbloom_amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand Down

0 comments on commit 2d6fe50

Please sign in to comment.