Revert setup ros step, use cmake -args

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
open-rmf · Nov 6, 2024 · f3143bb · f3143bb
1 parent d9c9bd9
commit f3143bb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -20,10 +20,21 @@ jobs:
         run: |
           sudo apt update && sudo apt install python3-pip -y
           pip3 install eclipse-zenoh==0.11.0 pycdr2 --break-system-packages
+
+      - uses: ros-tooling/setup-ros@v0.7
+        with:
+          required-ros-distributions: ${{ matrix.ros_distribution }}
+
       - name: build and test
         uses: ros-tooling/action-ros-ci@v0.3
-        env:
-          INTEGRATION_TESTING: false
         with:
           package-name: free_fleet free_fleet_adapter free_fleet_examples
           target-ros2-distro: ${{ matrix.ros_distribution }}
+          colcon-defaults: |
+            {
+              "build": {
+                "cmake-args": [
+                    "-DINTEGRATION_TESTING=OFF"
+                ]
+              }
+            }
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -25,13 +25,23 @@ jobs:
       - name: Start test fixture containers
         run: docker-compose -f ".github/integration-tests/docker-compose.yaml" up -d --build
 
+      - uses: ros-tooling/setup-ros@v0.7
+        with:
+          required-ros-distributions: ${{ matrix.ros_distribution }}
+
       - name: build and test
         uses: ros-tooling/action-ros-ci@v0.3
-        env:
-          INTEGRATION_TESTING: true
         with:
           package-name: free_fleet free_fleet_adapter free_fleet_examples
           target-ros2-distro: ${{ matrix.ros_distribution }}
+          colcon-defaults: |
+            {
+              "build": {
+                "cmake-args": [
+                    "-DINTEGRATION_TESTING=ON"
+                ]
+              }
+            }
 
       - name: Stop test fixture containers
         if: always()