Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gnss
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
plugins
gnss
Commits
e29eba15
Commit
e29eba15
authored
3 years ago
by
Joan Vallvé Navarro
Browse files
Options
Downloads
Plain Diff
Merge branch 'devel' into 'master'
new tag See merge request
!29
parents
5bd390c0
cb78737f
No related branches found
No related tags found
1 merge request
!29
new tag
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+2
-1
2 additions, 1 deletion
.gitignore
.gitlab-ci.yml
+4
-25
4 additions, 25 deletions
.gitlab-ci.yml
.vscode/c_cpp_properties.json
+0
-20
0 additions, 20 deletions
.vscode/c_cpp_properties.json
with
6 additions
and
46 deletions
.gitignore
+
2
−
1
View file @
e29eba15
...
@@ -6,4 +6,5 @@ build/
...
@@ -6,4 +6,5 @@ build/
bin/
bin/
lib/
lib/
gnss.found
gnss.found
.vscode
.vscode/c_cpp_properties.json
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
4
−
25
View file @
e29eba15
...
@@ -69,10 +69,10 @@ stages:
...
@@ -69,10 +69,10 @@ stages:
-
git checkout devel
-
git checkout devel
-
git pull
-
git pull
-
git checkout $WOLF_CORE_BRANCH
-
git checkout $WOLF_CORE_BRANCH
-
git pull
-
else
-
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
-
cd wolf
-
git checkout $WOLF_CORE_BRANCH
-
fi
-
fi
-
mkdir -pv build
-
mkdir -pv build
-
cd build
-
cd build
...
@@ -110,9 +110,9 @@ stages:
...
@@ -110,9 +110,9 @@ stages:
############ LICENSE HEADERS ############
############ LICENSE HEADERS ############
license_headers
:
license_headers
:
stage
:
license
stage
:
license
image
:
labrobotica/wolf_deps:
16
.04
image
:
labrobotica/wolf_deps:
20
.04
cache
:
cache
:
-
key
:
wolf-
xeni
al
-
key
:
wolf-
foc
al
paths
:
paths
:
-
ci_deps/wolf/
-
ci_deps/wolf/
except
:
except
:
...
@@ -123,27 +123,6 @@ license_headers:
...
@@ -123,27 +123,6 @@ license_headers:
script
:
script
:
-
*license_header_definition
-
*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 ############
############ UBUNTU 18.04 TESTS ############
build_and_test:bionic
:
build_and_test:bionic
:
image
:
labrobotica/wolf_deps:18.04
image
:
labrobotica/wolf_deps:18.04
...
...
This diff is collapsed.
Click to expand it.
.vscode/c_cpp_properties.json
deleted
100644 → 0
+
0
−
20
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment