From 5967bfab5fadfbadabcd072cb3148fb27886fc18 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Sep 2022 16:50:51 +0200 Subject: [PATCH 1/9] Add tests to conda-forge job --- .github/workflows/conda-forge.yml | 35 ++++++++++++++++++------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index a2e7b4aa87..15366bfdc2 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -10,6 +10,10 @@ on: # Execute a "nightly" build at 2 AM UTC - cron: '0 2 * * *' +env: + CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST + + jobs: build: name: '[${{ matrix.os }}@${{ matrix.build_type }}@conda]' @@ -67,7 +71,7 @@ jobs: run: | mkdir -p build cd build - cmake -GNinja -DBUILD_TESTING:BOOL=OFF -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} .. + cmake -GNinja -DBUILD_TESTING:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX .. - name: Build [Linux&macOS] if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu') @@ -76,12 +80,12 @@ jobs: cd build cmake --build . --config ${{ matrix.build_type }} -# - name: Test [Linux&macOS] -# if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu') -# shell: bash -l {0} -# run: | -# cd build -# ctest --output-on-failure -C ${{ matrix.build_type }} + - name: Test [Linux&macOS] + if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu') + shell: bash -l {0} + run: | + cd build + ctest --output-on-failure -C ${{ matrix.build_type }} -E "$CONDA_FORGE_FAILING_TESTS" - name: Configure [Windows] if: contains(matrix.os, 'windows') @@ -89,18 +93,19 @@ jobs: run: | mkdir -p build cd build - cmake -GNinja -DBUILD_TESTING:BOOL=OFF -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} .. + cmake -GNinja -DBUILD_TESTING:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library .. - - name: Build [Windows] + - name: Build and Install [Windows] if: contains(matrix.os, 'windows') shell: cmd /C call {0} run: | cd build cmake --build . --config ${{ matrix.build_type }} --parallel 2 + cmake --install . --config ${{ matrix.build_type }} -# - name: Test [Windows] -# if: contains(matrix.os, 'windows') -# shell: cmd /C call {0} -# run: | -# cd build -# ctest --output-on-failure -C ${{ matrix.build_type }} + - name: Test [Windows] + if: contains(matrix.os, 'windows') + shell: cmd /C call {0} + run: | + cd build + ctest --output-on-failure -C ${{ matrix.build_type }} -E "%CONDA_FORGE_FAILING_TESTS%" From 8c068bb36d4dc8d8a66fdb2435366d5daa4ee079 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Sep 2022 16:55:09 +0200 Subject: [PATCH 2/9] Update conda-forge.yml --- .github/workflows/conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index 15366bfdc2..416224b2e2 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -11,7 +11,7 @@ on: - cron: '0 2 * * *' env: - CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST + CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem jobs: From 9dc8b4b45c9c1937ddf5d10783106d87a665dcdf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Sep 2022 17:01:55 +0200 Subject: [PATCH 3/9] Update conda-forge.yml --- .github/workflows/conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index 416224b2e2..e9e24616a8 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -11,7 +11,7 @@ on: - cron: '0 2 * * *' env: - CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem + CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem|INTEGRATION_gz_log|INTEGRATION_imu|INTEGRATION_joint_force_torque jobs: From c5b991583a31edd59cd549b3ea80688338d69ed1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Sep 2022 17:15:02 +0200 Subject: [PATCH 4/9] Update conda-forge.yml --- .github/workflows/conda-forge.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index e9e24616a8..4d46ba04df 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -11,7 +11,7 @@ on: - cron: '0 2 * * *' env: - CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem|INTEGRATION_gz_log|INTEGRATION_imu|INTEGRATION_joint_force_torque + CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem|INTEGRATION_gz_log|INTEGRATION_imu|INTEGRATION_joint_force_torque|EXAMPLE_examples_build|REGRESSION_2527_distortion_leak|REGRESSION_config-cmake jobs: @@ -73,12 +73,15 @@ jobs: cd build cmake -GNinja -DBUILD_TESTING:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX .. - - name: Build [Linux&macOS] + - name: Build and Install [Linux&macOS] if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu') shell: bash -l {0} run: | cd build + # Workaround for https://github.com/osrf/gazebo/issues/3265 + cmake --build . --config ${{ matrix.build_type }} --target gazebo_msgs cmake --build . --config ${{ matrix.build_type }} + cmake --install . --config ${{ matrix.build_type }} - name: Test [Linux&macOS] if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu') @@ -100,6 +103,8 @@ jobs: shell: cmd /C call {0} run: | cd build + # Workaround for https://github.com/osrf/gazebo/issues/3265 + cmake --build . --config ${{ matrix.build_type }} --target gazebo_msgs cmake --build . --config ${{ matrix.build_type }} --parallel 2 cmake --install . --config ${{ matrix.build_type }} From 9e0c9bf3846cf35cc911018bfdb70c4f01d64e97 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Sep 2022 21:24:31 +0200 Subject: [PATCH 5/9] Update conda-forge.yml --- .github/workflows/conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index 4d46ba04df..36afcabd1f 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -11,7 +11,7 @@ on: - cron: '0 2 * * *' env: - CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem|INTEGRATION_gz_log|INTEGRATION_imu|INTEGRATION_joint_force_torque|EXAMPLE_examples_build|REGRESSION_2527_distortion_leak|REGRESSION_config-cmake + CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem|INTEGRATION_gz_log|INTEGRATION_imu|INTEGRATION_joint_force_torque|EXAMPLE_examples_build|REGRESSION_2527_distortion_leak|REGRESSION_config-cmake|UNIT_OpenAL_TEST|PERFORMANCE_transport_stress|INTEGRATION_physics_msgs|INTEGRATION_sdf_errors|INTEGRATION_speed|INTEGRATION_speed_thread_islands|INTEGRATION_tracked_vehicles|REGRESSION_2239_revolute2_teleport|REGRESSION_config-pkgconfig jobs: From 3b47332523448e373f693e282c598178a2b7d6d8 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Sep 2022 23:37:06 +0200 Subject: [PATCH 6/9] Update conda-forge.yml --- .github/workflows/conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index 36afcabd1f..3e60624c83 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -96,7 +96,7 @@ jobs: run: | mkdir -p build cd build - cmake -GNinja -DBUILD_TESTING:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library .. + cmake -GNinja -DBUILD_TESTING:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON .. - name: Build and Install [Windows] if: contains(matrix.os, 'windows') From 3139fa296636264fd7f6720f91ca3e231c2d64a0 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 09:32:43 +0200 Subject: [PATCH 7/9] Update conda-forge.yml --- .github/workflows/conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index 3e60624c83..4592b75828 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -11,7 +11,7 @@ on: - cron: '0 2 * * *' env: - CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem|INTEGRATION_gz_log|INTEGRATION_imu|INTEGRATION_joint_force_torque|EXAMPLE_examples_build|REGRESSION_2527_distortion_leak|REGRESSION_config-cmake|UNIT_OpenAL_TEST|PERFORMANCE_transport_stress|INTEGRATION_physics_msgs|INTEGRATION_sdf_errors|INTEGRATION_speed|INTEGRATION_speed_thread_islands|INTEGRATION_tracked_vehicles|REGRESSION_2239_revolute2_teleport|REGRESSION_config-pkgconfig + CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem|INTEGRATION_gz_log|INTEGRATION_imu|INTEGRATION_joint_force_torque|EXAMPLE_examples_build|REGRESSION_2527_distortion_leak|REGRESSION_config-cmake|UNIT_OpenAL_TEST|PERFORMANCE_transport_stress|INTEGRATION_physics_msgs|INTEGRATION_sdf_errors|INTEGRATION_speed|INTEGRATION_speed_thread_islands|INTEGRATION_tracked_vehicles|REGRESSION_2239_revolute2_teleport|REGRESSION_config-pkgconfig|INTEGRATION_harness|INTEGRATION_joint_set_position_test|INTEGRATION_joint_test|INTEGRATION_pioneer2dx|INTEGRATION_sdf|check_INTEGRATION_sdf|INTEGRATION_swarm|REGRESSION_1569_hydra_crash jobs: From 79931dfaaec7f521de58bbe4ab0c715c7039f506 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 12:35:00 +0200 Subject: [PATCH 8/9] Update conda-forge.yml --- .github/workflows/conda-forge.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index 4592b75828..223d78ea29 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -11,7 +11,7 @@ on: - cron: '0 2 * * *' env: - CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem|INTEGRATION_gz_log|INTEGRATION_imu|INTEGRATION_joint_force_torque|EXAMPLE_examples_build|REGRESSION_2527_distortion_leak|REGRESSION_config-cmake|UNIT_OpenAL_TEST|PERFORMANCE_transport_stress|INTEGRATION_physics_msgs|INTEGRATION_sdf_errors|INTEGRATION_speed|INTEGRATION_speed_thread_islands|INTEGRATION_tracked_vehicles|REGRESSION_2239_revolute2_teleport|REGRESSION_config-pkgconfig|INTEGRATION_harness|INTEGRATION_joint_set_position_test|INTEGRATION_joint_test|INTEGRATION_pioneer2dx|INTEGRATION_sdf|check_INTEGRATION_sdf|INTEGRATION_swarm|REGRESSION_1569_hydra_crash + CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem|INTEGRATION_gz_log|INTEGRATION_imu|INTEGRATION_joint_force_torque|EXAMPLE_examples_build|REGRESSION_2527_distortion_leak|REGRESSION_config-cmake|UNIT_OpenAL_TEST|PERFORMANCE_transport_stress|INTEGRATION_physics_msgs|INTEGRATION_sdf_errors|INTEGRATION_speed|INTEGRATION_speed_thread_islands|INTEGRATION_tracked_vehicles|REGRESSION_2239_revolute2_teleport|REGRESSION_config-pkgconfig|INTEGRATION_harness|INTEGRATION_joint_set_position_test|INTEGRATION_joint_test|INTEGRATION_pioneer2dx|INTEGRATION_sdf|check_INTEGRATION_sdf|INTEGRATION_swarm|REGRESSION_1569_hydra_crash|INTEGRATION_file_handling|INTEGRATION_gz_joint|REGRESSION_2430_revolute_joint_SetPosition jobs: @@ -113,4 +113,6 @@ jobs: shell: cmd /C call {0} run: | cd build + # Make sure that gtest shared library is found correctly + set PATH=%PATH%;%CD%\test ctest --output-on-failure -C ${{ matrix.build_type }} -E "%CONDA_FORGE_FAILING_TESTS%" From b63585ab63b67c797f72e6eee002d49f88849fd8 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 24 Sep 2022 17:04:34 +0200 Subject: [PATCH 9/9] Update conda-forge.yml --- .github/workflows/conda-forge.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index 223d78ea29..9217eb96c4 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -11,7 +11,7 @@ on: - cron: '0 2 * * *' env: - CONDA_FORGE_FAILING_TESTS: UNIT_Dem_TEST|UNIT_Event_TEST|UNIT_FuelModelDatabase_TEST|UNIT_Image_TEST|UNIT_SonarSensor_TEST|UNIT_gz_TEST|INTEGRATION_contact_sensor|INTEGRATION_dem|INTEGRATION_gz_log|INTEGRATION_imu|INTEGRATION_joint_force_torque|EXAMPLE_examples_build|REGRESSION_2527_distortion_leak|REGRESSION_config-cmake|UNIT_OpenAL_TEST|PERFORMANCE_transport_stress|INTEGRATION_physics_msgs|INTEGRATION_sdf_errors|INTEGRATION_speed|INTEGRATION_speed_thread_islands|INTEGRATION_tracked_vehicles|REGRESSION_2239_revolute2_teleport|REGRESSION_config-pkgconfig|INTEGRATION_harness|INTEGRATION_joint_set_position_test|INTEGRATION_joint_test|INTEGRATION_pioneer2dx|INTEGRATION_sdf|check_INTEGRATION_sdf|INTEGRATION_swarm|REGRESSION_1569_hydra_crash|INTEGRATION_file_handling|INTEGRATION_gz_joint|REGRESSION_2430_revolute_joint_SetPosition + CONDA_FORGE_TESTS_TO_RUN: INTEGRATION_transport_msg_count jobs: @@ -88,7 +88,7 @@ jobs: shell: bash -l {0} run: | cd build - ctest --output-on-failure -C ${{ matrix.build_type }} -E "$CONDA_FORGE_FAILING_TESTS" + ctest --output-on-failure -C ${{ matrix.build_type }} -R "$CONDA_FORGE_TESTS_TO_RUN" - name: Configure [Windows] if: contains(matrix.os, 'windows') @@ -115,4 +115,4 @@ jobs: cd build # Make sure that gtest shared library is found correctly set PATH=%PATH%;%CD%\test - ctest --output-on-failure -C ${{ matrix.build_type }} -E "%CONDA_FORGE_FAILING_TESTS%" + ctest --output-on-failure -C ${{ matrix.build_type }} -R "%CONDA_FORGE_TESTS_TO_RUN%"