Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mobile_robotics
wolf_projects
wolf_lib
plugins
gnss
Commits
e29eba15
Commit
e29eba15
authored
Mar 09, 2022
by
Joan Vallvé Navarro
Browse files
Merge branch 'devel' into 'master'
new tag See merge request
!29
parents
5bd390c0
cb78737f
Changes
3
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
e29eba15
...
...
@@ -6,4 +6,5 @@ build/
bin/
lib/
gnss.found
.vscode
.vscode/c_cpp_properties.json
.gitlab-ci.yml
View file @
e29eba15
...
...
@@ -69,10 +69,10 @@ stages:
-
git checkout devel
-
git pull
-
git checkout $WOLF_CORE_BRANCH
-
git pull
-
else
-
git clone ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/wolf.git
-
git clone
-b $WOLF_CORE_BRANCH
ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/wolf.git
-
cd wolf
-
git checkout $WOLF_CORE_BRANCH
-
fi
-
mkdir -pv build
-
cd build
...
...
@@ -110,9 +110,9 @@ stages:
############ LICENSE HEADERS ############
license_headers
:
stage
:
license
image
:
labrobotica/wolf_deps:
16
.04
image
:
labrobotica/wolf_deps:
20
.04
cache
:
-
key
:
wolf-
xeni
al
-
key
:
wolf-
foc
al
paths
:
-
ci_deps/wolf/
except
:
...
...
@@ -123,27 +123,6 @@ license_headers:
script
:
-
*license_header_definition
############ UBUNTU 16.04 TESTS ############
build_and_test:xenial:
image
:
labrobotica/wolf_deps:16.04
stage
:
build_and_test
cache
:
-
key
:
wolf-xenial
paths
:
-
ci_deps/wolf/
-
key
:
gnssutils-xenial
paths
:
-
ci_deps/gnss_utils/
except
:
-
master
before_script
:
-
*preliminaries_definition
-
*install_wolf_definition
-
*install_gnssutils_definition
-
ldconfig
# update links (shared libraries)
script
:
-
*build_and_test_definition
############ UBUNTU 18.04 TESTS ############
build_and_test:bionic:
image
:
labrobotica/wolf_deps:18.04
...
...
.vscode/c_cpp_properties.json
deleted
100644 → 0
View file @
5bd390c0
{
"configurations"
:
[
{
"name"
:
"Linux"
,
"includePath"
:
[
"${workspaceFolder}/**"
,
"/home/aeroarms/iri-lab/external_libs/wolf/include"
,
"/usr/local/include/iri-algorithms/wolf/plugin_core"
,
"/usr/local/include/eigen3"
,
"/usr/local/include/iri-algorithms"
],
"defines"
:
[],
"compilerPath"
:
"/usr/bin/gcc"
,
"cStandard"
:
"gnu11"
,
"cppStandard"
:
"c++17"
,
"intelliSenseMode"
:
"gcc-x64"
}
],
"version"
:
4
}
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment