Skip to content
Snippets Groups Projects
Commit 8e1e95ff authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge remote-tracking branch 'origin/devel' into 415-solverceres-more-parameters

parents 7e7a8271 8147a9fa
No related branches found
No related tags found
2 merge requests!427Resolve "Wolf license",!426Resolve "SolverCeres: more parameters"
...@@ -9,7 +9,12 @@ ...@@ -9,7 +9,12 @@
- ../bin/hello_wolf_autoconf - ../bin/hello_wolf_autoconf
- make install - make install
stages:
- build_and_test
- deploy
build_and_test:xenial: build_and_test:xenial:
stage: build_and_test
image: labrobotica/wolf_deps:16.04 image: labrobotica/wolf_deps:16.04
except: except:
- master - master
...@@ -17,8 +22,15 @@ build_and_test:xenial: ...@@ -17,8 +22,15 @@ build_and_test:xenial:
- *build_and_test_definition - *build_and_test_definition
build_and_test:bionic: build_and_test:bionic:
stage: build_and_test
image: labrobotica/wolf_deps:18.04 image: labrobotica/wolf_deps:18.04
except: except:
- master - master
script: script:
- *build_and_test_definition - *build_and_test_definition
\ No newline at end of file
deploy:
stage: deploy
variables:
WOLF_CORE_BRANCH: $CI_COMMIT_BRANCH
trigger: mobile_robotics/wolf_projects/wolf_lib/plugins/imu
\ No newline at end of file
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