diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 96eb72873..4eb51184a 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -8,7 +8,7 @@ jobs: runs-on: [ubuntu-22.04] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Run project tests run: | diff --git a/.gitignore b/.gitignore index 071c4a8d8..899cf1b11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ hpp/idl/*.pyc .docs/build +_unittests/build/ +_unittests/install/ diff --git a/_unittests/cpp/CMakeLists.txt b/_unittests/cpp/CMakeLists.txt index 12a540adf..40cd1e4e4 100644 --- a/_unittests/cpp/CMakeLists.txt +++ b/_unittests/cpp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.10) set(PROJECT_NAME jrl-cmakemodules-cpp) set(PROJECT_VERSION 0.0.0) diff --git a/_unittests/dependency/CMakeLists.txt b/_unittests/dependency/CMakeLists.txt index 9c0e0e616..35f7f7949 100644 --- a/_unittests/dependency/CMakeLists.txt +++ b/_unittests/dependency/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.10) set(PROJECT_NAME jrl-cmakemodules-dependency) set(PROJECT_VERSION 0.0.0) diff --git a/_unittests/python/CMakeLists.txt b/_unittests/python/CMakeLists.txt index 1d04e1def..97631c3d2 100644 --- a/_unittests/python/CMakeLists.txt +++ b/_unittests/python/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.10) # These variables have to be defined before running SETUP_PROJECT set(PROJECT_NAME jrl-cmakemodules-python) diff --git a/_unittests/run_unit_tests.sh b/_unittests/run_unit_tests.sh index 337673d39..a062b1bae 100755 --- a/_unittests/run_unit_tests.sh +++ b/_unittests/run_unit_tests.sh @@ -1,5 +1,8 @@ #!/bin/bash +set -e +set -x + unittests="python cpp dependency catkin" # Code for running a specific unit test