feature: fix add old workflow in and test

tier4 · Oct 2, 2024 · a1ad692 · a1ad692
1 parent 2ed3c5e
commit a1ad692
Showing 1 changed file with 46 additions and 46 deletions.
diff --git a/.github/workflows/BuildAndRun.yaml b/.github/workflows/BuildAndRun.yaml
@@ -54,59 +54,59 @@ jobs:
         run: |
           echo package_list=$(colcon list --names-only | tr '\n' ' ') >> $GITHUB_OUTPUT
 
-      # - name: Show target packages
-      #   run: |
-      #     echo "Target packages: ${{ steps.list_packages.outputs.package_list }}"
+      - name: Show target packages
+        run: |
+          echo "Target packages: ${{ steps.list_packages.outputs.package_list }}"
 
-      # - name: Install dependencies
-      #   run: |
-      #     vcs import src < src/scenario_simulator_v2/dependency_${{ matrix.rosdistro }}.repos
+      - name: Install dependencies
+        run: |
+          vcs import src < src/scenario_simulator_v2/dependency_${{ matrix.rosdistro }}.repos
 
-      # - name: Resolve rosdep and install colcon mixin
-      #   run: |
-      #     apt-get update
-      #     apt-get install -y python3-pip python3-colcon-lcov-result lcov
-      #     rosdep update --include-eol-distros
-      #     rosdep install -iy --from-paths src --rosdistro ${{ matrix.rosdistro }}
-      #     colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
-      #     colcon mixin update default
-      #   shell: bash
+      - name: Resolve rosdep and install colcon mixin
+        run: |
+          apt-get update
+          apt-get install -y python3-pip python3-colcon-lcov-result lcov
+          rosdep update --include-eol-distros
+          rosdep install -iy --from-paths src --rosdistro ${{ matrix.rosdistro }}
+          colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
+          colcon mixin update default
+        shell: bash
 
-      # - name: Build packages
-      #   run: |
-      #     source /opt/ros/${{ matrix.rosdistro }}/setup.bash
-      #     colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_CPP_MOCK_SCENARIOS=ON -DBUILD_TESTING=true -DCMAKE_CXX_FLAGS='-fprofile-arcs -ftest-coverage' -DCMAKE_C_FLAGS='-fprofile-arcs -ftest-coverage' --packages-up-to ${{ steps.list_packages.outputs.package_list }}
-      #   shell: bash
+      - name: Build packages
+        run: |
+          source /opt/ros/${{ matrix.rosdistro }}/setup.bash
+          colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_CPP_MOCK_SCENARIOS=ON -DBUILD_TESTING=true -DCMAKE_CXX_FLAGS='-fprofile-arcs -ftest-coverage' -DCMAKE_C_FLAGS='-fprofile-arcs -ftest-coverage' --packages-up-to ${{ steps.list_packages.outputs.package_list }}
+        shell: bash
 
-      # - name: Colcon test
-      #   run: |
-      #     source /opt/ros/${{ matrix.rosdistro }}/setup.bash
-      #     source install/local_setup.bash
-      #     colcon test --event-handlers console_cohesion+ --packages-select ${{ steps.list_packages.outputs.package_list }}
-      #     colcon lcov-result --packages-select ${{ steps.list_packages.outputs.package_list }}
-      #   shell: bash
+      - name: Colcon test
+        run: |
+          source /opt/ros/${{ matrix.rosdistro }}/setup.bash
+          source install/local_setup.bash
+          colcon test --event-handlers console_cohesion+ --packages-select ${{ steps.list_packages.outputs.package_list }}
+          colcon lcov-result --packages-select ${{ steps.list_packages.outputs.package_list }}
+        shell: bash
 
-      # - name: Show test result
-      #   if: always()
-      #   run: |
-      #     source /opt/ros/${{ matrix.rosdistro }}/setup.bash
-      #     source install/local_setup.bash
-      #     colcon test-result --verbose
-      #   shell: bash
+      - name: Show test result
+        if: always()
+        run: |
+          source /opt/ros/${{ matrix.rosdistro }}/setup.bash
+          source install/local_setup.bash
+          colcon test-result --verbose
+        shell: bash
 
-      # - name: Scenario test
-      #   run: |
-      #     source install/setup.bash
-      #     source install/local_setup.bash
-      #     ./src/scenario_simulator_v2/.github/workflows/workflow.sh ./src/scenario_simulator_v2/test_runner/scenario_test_runner/config/workflow.txt global_frame_rate:=20
-      #   shell: bash
+      - name: Scenario test
+        run: |
+          source install/setup.bash
+          source install/local_setup.bash
+          ./src/scenario_simulator_v2/.github/workflows/workflow.sh ./src/scenario_simulator_v2/test_runner/scenario_test_runner/config/workflow.txt global_frame_rate:=20
+        shell: bash
 
-      # - name: Upload Lcov result
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: lcov
-      #     path: lcov
-      #     retention-days: 1
+      - name: Upload Lcov result
+        uses: actions/upload-artifact@v4
+        with:
+          name: lcov
+          path: lcov
+          retention-days: 1
 
       - name: Run SonarCloud scan
         uses: SonarSource/sonarcloud-github-action@master