From 9e9bfe901ac5ffa0653efeb094034072c648ff97 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 18 Dec 2024 22:09:10 +0100 Subject: [PATCH 1/5] Add integration test to CI --- .github/workflows/conda-forge-ci.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml index 19e93b74..146896c1 100644 --- a/.github/workflows/conda-forge-ci.yml +++ b/.github/workflows/conda-forge-ci.yml @@ -62,7 +62,7 @@ jobs: mkdir -p build cd build cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_IK:BOOL=OFF \ - -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} .. + -DFRAMEWORK_COMPILE_PYTHON_BINDINGS: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') @@ -84,7 +84,7 @@ jobs: run: | mkdir -p build cd build - cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} .. + cmake -GNinja -DBUILD_TESTING:BOOL=ON -DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=ON -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library .. - name: Build [Windows] if: contains(matrix.os, 'windows') @@ -99,3 +99,18 @@ jobs: run: | cd build ctest --output-on-failure -C ${{ matrix.build_type }} -E "Bootstrap" + + - name: Install + shell: bash -l {0} + run: | + cd build + ctest --install . + + - name: Integration test: run a configure of the robotology-superbuild + shell: bash -l {0} + run: | + mkdir testint + cd testint + git clone https://github.com/robotology/robotology-superbuild/ + cd robotology-superbuild/ + cmake -Bbuild -S. From 4587ae24b42a394f340b6b44d4bfa9913c555c2c Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 18 Dec 2024 22:14:44 +0100 Subject: [PATCH 2/5] Update conda-forge-ci.yml --- .github/workflows/conda-forge-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml index 146896c1..d1d69aa5 100644 --- a/.github/workflows/conda-forge-ci.yml +++ b/.github/workflows/conda-forge-ci.yml @@ -106,7 +106,7 @@ jobs: cd build ctest --install . - - name: Integration test: run a configure of the robotology-superbuild + - name: Integration test run a configure of the robotology-superbuild shell: bash -l {0} run: | mkdir testint From bd3234d97adfa1d2fc1c158ec77aab91cdfebd57 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 18 Dec 2024 22:16:54 +0100 Subject: [PATCH 3/5] Update conda-forge-ci.yml --- .github/workflows/conda-forge-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml index d1d69aa5..163dee75 100644 --- a/.github/workflows/conda-forge-ci.yml +++ b/.github/workflows/conda-forge-ci.yml @@ -104,7 +104,7 @@ jobs: shell: bash -l {0} run: | cd build - ctest --install . + cmake --install . - name: Integration test run a configure of the robotology-superbuild shell: bash -l {0} From 985ef49d174e2e1b091772f7226feead3a1394cc Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 18 Dec 2024 22:35:45 +0100 Subject: [PATCH 4/5] Update conda-forge-ci.yml --- .github/workflows/conda-forge-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml index 163dee75..9b3487c2 100644 --- a/.github/workflows/conda-forge-ci.yml +++ b/.github/workflows/conda-forge-ci.yml @@ -113,4 +113,6 @@ jobs: cd testint git clone https://github.com/robotology/robotology-superbuild/ cd robotology-superbuild/ + git config --global user.name CI User + git config --global user.email ciuser@example.com cmake -Bbuild -S. From 23da2f201ebf3c9aeccfaca3da42511033acf146 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 18 Dec 2024 22:47:00 +0100 Subject: [PATCH 5/5] Install YCMEPHelper helper files --- modules/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 046e556d..a382da83 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -16,6 +16,12 @@ set(YCM_MODULES AddInstallRPATHSupport.cmake _ycm_install(modules FILES ${YCM_MODULES} DESTINATION "${YCM_INSTALL_MODULE_DIR}/modules") +set(YCMEPHELPER_FILES YCMEPHelper/RepositoryInfo.txt.in + YCMEPHelper/gitsafeclone.txt.in) + +_ycm_install(modules FILES ${YCMEPHELPER_FILES} + DESTINATION "${YCM_INSTALL_MODULE_DIR}/modules/YCMEPHelper") + # Print a warning if we are overriding some module from CMake foreach(_module IN LISTS YCM_MODULES) if(EXISTS "${CMAKE_ROOT}/Modules/${_module}")