ci: update build and test workflow

Signed-off-by: Keisuke Shima <19993104+KeisukeShima@users.noreply.github.com>
autowarefoundation · Feb 8, 2022 · 98c6771 · 98c6771
1 parent 2268517
commit 98c6771
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 28 deletions.
diff --git a/.github/workflows/build-and-test-arm-pr.yaml b/.github/workflows/build-and-test-arm-pr.yaml
@@ -37,9 +37,17 @@ jobs:
         id: get-modified-packages
         uses: autowarefoundation/autoware-github-actions/get-modified-packages@tier4/proposal
 
-      - name: Build and test
+      - name: Build
         if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
-        uses: autowarefoundation/autoware-github-actions/colcon-build-and-test@tier4/proposal
+        uses: autowarefoundation/autoware-github-actions/colcon-build@tier4/proposal
+        with:
+          rosdistro: galactic
+          target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
+          build-depends-repos: build_depends.repos
+
+      - name: Test
+        if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
+        uses: autowarefoundation/autoware-github-actions/colcon-test@tier4/proposal
         with:
           rosdistro: galactic
           target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}

diff --git a/.github/workflows/build-and-test-arm.yaml b/.github/workflows/build-and-test-arm.yaml
@@ -25,8 +25,15 @@ jobs:
         id: get-self-packages
         uses: autowarefoundation/autoware-github-actions/get-self-packages@tier4/proposal
 
-      - name: Build and test
-        uses: autowarefoundation/autoware-github-actions/colcon-build-and-test@tier4/proposal
+      - name: Build
+        uses: autowarefoundation/autoware-github-actions/colcon-build@tier4/proposal
+        with:
+          rosdistro: galactic
+          target-packages: ${{ steps.get-self-packages.outputs.self-packages }}
+          build-depends-repos: build_depends.repos
+
+      - name: Test
+        uses: autowarefoundation/autoware-github-actions/colcon-test@tier4/proposal
         with:
           rosdistro: galactic
           target-packages: ${{ steps.get-self-packages.outputs.self-packages }}

diff --git a/.github/workflows/build-and-test-pr.yaml b/.github/workflows/build-and-test-pr.yaml
@@ -28,28 +28,28 @@ jobs:
         id: get-modified-packages
         uses: autowarefoundation/autoware-github-actions/get-modified-packages@tier4/proposal
 
-      - name: Build and test
+      - name: Build
         if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
-        uses: autowarefoundation/autoware-github-actions/colcon-build-and-test@tier4/proposal
+        uses: autowarefoundation/autoware-github-actions/colcon-build@tier4/proposal
         with:
           rosdistro: galactic
           target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
           build-depends-repos: build_depends.repos
 
-      - name: Check the existence of coverage files
-        id: check-file-existence
-        uses: autowarefoundation/autoware-github-actions/check-file-existence@tier4/proposal
+      - name: Test
+        id: test
+        if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
+        uses: autowarefoundation/autoware-github-actions/colcon-test@tier4/proposal
         with:
-          files: |
-            lcov/total_coverage.info
-            coveragepy/.coverage
-          condition: or
+          rosdistro: galactic
+          target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
+          build-depends-repos: build_depends.repos
 
       - name: Upload coverage to CodeCov
-        if: ${{ steps.check-file-existence.outputs.exists == 'true' }}
+        if: ${{ steps.test.outputs.coverage-report-files != '' }}
         uses: codecov/codecov-action@v2
         with:
-          files: lcov/total_coverage.info,coveragepy/.coverage
+          files: ${{ steps.test.outputs.coverage-report-files }}
           fail_ci_if_error: true
           verbose: true
 

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -29,26 +29,25 @@ jobs:
         id: get-self-packages
         uses: autowarefoundation/autoware-github-actions/get-self-packages@tier4/proposal
 
-      - name: Build and test
-        uses: autowarefoundation/autoware-github-actions/colcon-build-and-test@tier4/proposal
+      - name: Build
+        uses: autowarefoundation/autoware-github-actions/colcon-build@tier4/proposal
         with:
           rosdistro: galactic
           target-packages: ${{ steps.get-self-packages.outputs.self-packages }}
           build-depends-repos: build_depends.repos
 
-      - name: Check the existence of coverage files
-        id: check-file-existence
-        uses: autowarefoundation/autoware-github-actions/check-file-existence@tier4/proposal
+      - name: Test
+        id: test
+        uses: autowarefoundation/autoware-github-actions/colcon-test@tier4/proposal
         with:
-          files: |
-            lcov/total_coverage.info
-            coveragepy/.coverage
-          condition: or
+          rosdistro: galactic
+          target-packages: ${{ steps.get-self-packages.outputs.self-packages }}
+          build-depends-repos: build_depends.repos
 
       - name: Upload coverage to CodeCov
-        if: ${{ steps.check-file-existence.outputs.exists == 'true' }}
+        if: ${{ steps.test.outputs.coverage-report-files != '' }}
         uses: codecov/codecov-action@v2
         with:
-          files: lcov/total_coverage.info,coveragepy/.coverage
+          files: ${{ steps.test.outputs.coverage-report-files }}
           fail_ci_if_error: true
           verbose: true
diff --git a/.github/workflows/check-build-depends.yaml b/.github/workflows/check-build-depends.yaml
@@ -28,8 +28,15 @@ jobs:
         id: get-self-packages
         uses: autowarefoundation/autoware-github-actions/get-self-packages@tier4/proposal
 
-      - name: Build and test
-        uses: autowarefoundation/autoware-github-actions/colcon-build-and-test@tier4/proposal
+      - name: Build
+        uses: autowarefoundation/autoware-github-actions/colcon-build@tier4/proposal
+        with:
+          rosdistro: galactic
+          target-packages: ${{ steps.get-self-packages.outputs.self-packages }}
+          build-depends-repos: build_depends.repos
+
+      - name: Test
+        uses: autowarefoundation/autoware-github-actions/colcon-test@tier4/proposal
         with:
           rosdistro: galactic
           target-packages: ${{ steps.get-self-packages.outputs.self-packages }}