diff --git a/.gitignore b/.gitignore
index 16b3745485fe88fe7659d2e66e429a93a1130c93..4af768a7d9d0328dbaf8cbe79d9c82168a7a5ffa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ build/
bin/
lib/
gnss.found
-
+.vscode
+.vscode/c_cpp_properties.json
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 045cce1f099409a2ae75deb375101ba46c0a2067..79bfa327e6fcd544afe53a63fb6cdeadcf760bcd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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-xenial
+ - key: wolf-focal
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
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
deleted file mode 100644
index c10fac6d636970d7f043e2a7e45ad71f51dc6a27..0000000000000000000000000000000000000000
--- a/.vscode/c_cpp_properties.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "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