diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 896c0e4136783b43e91242f957e6a339ce9abd18..e82e974b999a1fc1da89c02ace4a6c75a19c4898 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,5 @@ image: segaleran/ceres -cache: - key: "$CI_COMMIT_REF_NAME" - untracked: true - paths: - - build - - bin - - lib - before_script: - ls - apt-get update @@ -63,10 +55,8 @@ before_script: - make install - cd ../.. -wolf_build: +wolf_build_and_test: stage: build -# only: -# - renameFixPose except: - master script: @@ -75,13 +65,4 @@ wolf_build: - ls # we can check whether the directory was already full - cmake -DCMAKE_BUILD_TYPE=release .. - make - -wolf_test: - stage: test -# only: -# - renameFixPose - except: - - master - script: - - cd build - ctest diff --git a/src/test/gtest/CMakeLists.txt b/src/test/gtest/CMakeLists.txt index 4e1bbcd652e9581df326a7ad484e9f98a2aa5650..5ff6db603357a6e6751fe632135f937b389e240f 100644 --- a/src/test/gtest/CMakeLists.txt +++ b/src/test/gtest/CMakeLists.txt @@ -31,7 +31,7 @@ ExternalProject_Add(googletest PREFIX "${CMAKE_CURRENT_BINARY_DIR}" # Disable install step INSTALL_COMMAND "" - UPDATE_DISCONNECTED 1 + UPDATE_DISCONNECTED 1 # 1: do not update googletest; 0: update googletest via github ) # Get GTest source and binary directories from CMake project