Skip to content
Snippets Groups Projects
Commit 0776bc1d authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Merge branch 'CI_one_job' into 'master'

Ci one job

See merge request mobile_robotics/wolf!154
parents 695c7fcf 44419cee
No related branches found
No related tags found
1 merge request!154Ci one job
......@@ -55,16 +55,8 @@ before_script:
- make install
- cd ../..
wolf_build:
wolf_build_and_test:
stage: build
cache:
#key: "$CI_COMMIT_REF_NAME"
untracked: true
paths:
- build
- bin
- lib
policy: push
except:
- master
script:
......@@ -73,19 +65,4 @@ wolf_build:
- ls # we can check whether the directory was already full
- cmake -DCMAKE_BUILD_TYPE=release ..
- make
wolf_test:
stage: test
cache:
#key: "$CI_COMMIT_REF_NAME"
untracked: true
paths:
- build
- bin
- lib
policy: pull
except:
- master
script:
- cd build
- ctest
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment