From 3237af5434f30dfc81e30f7da78307dc034eb57c Mon Sep 17 00:00:00 2001 From: Carlos Mastalli Date: Sat, 9 Dec 2023 09:15:57 +0000 Subject: [PATCH] [ci] Disable multi-threading in ROS jobs --- .github/workflows/ros1-ci.yaml | 3 ++- .github/workflows/ros2-ci.yaml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ros1-ci.yaml b/.github/workflows/ros1-ci.yaml index a32368f9d5..b3dd96eef2 100644 --- a/.github/workflows/ros1-ci.yaml +++ b/.github/workflows/ros1-ci.yaml @@ -9,7 +9,8 @@ jobs: fail-fast: false matrix: env: - - {name: "(noetic, clang, multi-threading, Release)", ROS_DISTRO: noetic, ADDITIONAL_DEBS: "clang libomp-dev", CC: clang, CXX: clang++, CMAKE_ARGS: "-DBUILD_WITH_MULTITHREADS=ON -DBUILD_WITH_NTHREADS=2"} + - {name: "(noetic, Release)", ROS_DISTRO: noetic} + # - {name: "(noetic, clang, multi-threading, Release)", ROS_DISTRO: noetic, ADDITIONAL_DEBS: "clang libomp-dev", CC: clang, CXX: clang++, CMAKE_ARGS: "-DBUILD_WITH_MULTITHREADS=ON -DBUILD_WITH_NTHREADS=2"} name: ${{ matrix.env.name }} env: CCACHE_DIR: /github/home/.ccache # Enable ccache diff --git a/.github/workflows/ros2-ci.yaml b/.github/workflows/ros2-ci.yaml index da8403a74f..712e9e3348 100644 --- a/.github/workflows/ros2-ci.yaml +++ b/.github/workflows/ros2-ci.yaml @@ -9,9 +9,9 @@ jobs: fail-fast: false matrix: env: - - {name: "(humble, multi-threading, Release)", ROS_DISTRO: humble, ADDITIONAL_DEBS: "libomp-dev", CMAKE_ARGS: "-DBUILD_WITH_MULTITHREADS=ON -DBUILD_WITH_NTHREADS=2"} - - {name: "(rolling, multi-threading, Release)", ROS_DISTRO: rolling, ADDITIONAL_DEBS: "libomp-dev", CMAKE_ARGS: "-DBUILD_WITH_MULTITHREADS=ON -DBUILD_WITH_NTHREADS=2"} - - {name: "(iron, multi-threading, Release)", ROS_DISTRO: iron, ADDITIONAL_DEBS: "libomp-dev", CMAKE_ARGS: "-DBUILD_WITH_MULTITHREADS=ON -DBUILD_WITH_NTHREADS=2"} + - {name: "(humble, Release)", ROS_DISTRO: humble} + - {name: "(rolling, Release)", ROS_DISTRO: rolling} + - {name: "(iron, Release)", ROS_DISTRO: iron} # - {name: "(humble, clang, multi-threading, Release)", ROS_DISTRO: humble, ADDITIONAL_DEBS: "clang libomp-dev", CC: clang, CXX: clang++, CMAKE_ARGS: "-DBUILD_WITH_MULTITHREADS=ON -DBUILD_WITH_NTHREADS=2"} # - {name: "(rolling, clang, multi-threading, Release)", ROS_DISTRO: rolling, ADDITIONAL_DEBS: "clang libomp-dev", CC: clang, CXX: clang++, CMAKE_ARGS: "-DBUILD_WITH_MULTITHREADS=ON -DBUILD_WITH_NTHREADS=2"} # - {name: "(iron, clang, multi-threading, Release)", ROS_DISTRO: iron, ADDITIONAL_DEBS: "clang libomp-dev", CC: clang, CXX: clang++, CMAKE_ARGS: "-DBUILD_WITH_MULTITHREADS=ON -DBUILD_WITH_NTHREADS=2"}