update

Signed-off-by: Y.Hisaki <[email protected]>
autowarefoundation · Nov 29, 2024 · b9beeb6 · b9beeb6
1 parent c11d6f9
commit b9beeb6
Showing 1 changed file with 4 additions and 35 deletions.
diff --git a/.github/workflows/build-and-test-differential.yaml b/.github/workflows/build-and-test-differential.yaml
@@ -32,48 +32,17 @@ jobs:
     if: ${{ needs.make-sure-label-is-present.outputs.result == 'true' }}
     runs-on: ubuntu-latest
     outputs:
-      strategy: ${{ steps.generate-strategy.outputs.suffix-list }}
+      strategy: ${{ steps.generate-strategy.outputs.strategy }}
     steps:
       - name: Generate strategy
         id: generate-strategy
         run: |
           if [ "${{ needs.make-sure-require-cuda-label-is-present.outputs.result }}" != "true" ]; then
-            strategy='{
-              "rosdistro": ["humble"],
-              "container-suffix": [""],
-              "include": [
-                {
-                  "rosdistro": "humble",
-                  "container": "ghcr.io/autowarefoundation/autoware:universe-devel",
-                  "build-depends-repos": "build_depends.repos"
-                },
-                {
-                  "container-suffix": "",
-                  "runner": "ubuntu-latest",
-                  "build-pre-command": ""
-                }
-              ]
-            }'
+            strategy='{"rosdistro":["humble"],"container-suffix":[""],"include":[{"rosdistro":"humble","container":"ghcr.io/autowarefoundation/autoware:universe-devel","build-depends-repos":"build_depends.repos"},{"container-suffix":"","runner":"ubuntu-latest","build-pre-command":""}]}'
           else
-            strategy='{
-              "rosdistro": ["humble"],
-              "container-suffix": ["-cuda"],
-              "include": [
-                {
-                  "rosdistro": "humble",
-                  "container": "ghcr.io/autowarefoundation/autoware:universe-devel",
-                  "build-depends-repos": "build_depends.repos"
-                },
-                {
-                  "container-suffix": "-cuda",
-                  "runner": "codebuild-autoware-us-east-1-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-large",
-                  "build-pre-command": "taskset --cpu-list 0-5"
-                }
-              ]
-            }'
+            strategy='{"rosdistro":["humble"],"container-suffix":["-cuda"],"include":[{"rosdistro":"humble","container":"ghcr.io/autowarefoundation/autoware:universe-devel","build-depends-repos":"build_depends.repos"},{"container-suffix":"-cuda","runner":"codebuild-autoware-us-east-1-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-large","build-pre-command":"taskset --cpu-list 0-5"}]}'
           fi
-          echo $strategy
-          echo "::set-output name=strategy::${strategy}"
+          echo "::set-output name=strategy::$(echo $strategy | jq -c .)"
 
   build-and-test-differential:
     needs: [generate-strategy]