Updates to Docker, Readme and CI

This commit is contained in:
Vladyslav Usenko 2020-04-28 23:01:10 +02:00
parent 24d5d5b3f7
commit 0b0399a1f9
3 changed files with 14 additions and 8 deletions

View File

@ -1,4 +1,4 @@
image: vladyslavusenko/b_image:latest image: vladyslavusenko/b_image_bionic:latest
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
@ -141,6 +141,7 @@ stages:
bionic-release-compile: bionic-release-compile:
<<: *prepare_docker_definition <<: *prepare_docker_definition
<<: *compile_test_package_definition <<: *compile_test_package_definition
image: vladyslavusenko/b_image_bionic:latest
variables: variables:
CXX_MARCH: 'sandybridge' CXX_MARCH: 'sandybridge'
DEB_DIR: deb_bionic DEB_DIR: deb_bionic
@ -224,6 +225,7 @@ clang-format:
bionic-test: bionic-test:
<<: *test_deb_definition <<: *test_deb_definition
image: vladyslavusenko/b_image_bionic:latest
only: only:
- master - master
variables: variables:
@ -362,7 +364,7 @@ docker-build-bionic:
variables: variables:
DOCKER_TLS_CERTDIR: '/certs' DOCKER_TLS_CERTDIR: '/certs'
GIT_SUBMODULE_STRATEGY: none GIT_SUBMODULE_STRATEGY: none
B_IMAGE_NAME: b_image B_IMAGE_NAME: b_image_bionic
docker-build-xenial: docker-build-xenial:
<<: *docker_build_definition <<: *docker_build_definition
@ -395,21 +397,21 @@ docker-build-focal:
- basalt_rs_t265_vio --help - basalt_rs_t265_vio --help
- basalt_rs_t265_record --help - basalt_rs_t265_record --help
repository-check-bionic: bionic-repository-check:
image: ubuntu:18.04 image: ubuntu:18.04
<<: *repository_check_definition <<: *repository_check_definition
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
REPO_NAME: bionic REPO_NAME: bionic
repository-check-xenial: xenial-repository-check:
image: ubuntu:16.04 image: ubuntu:16.04
<<: *repository_check_definition <<: *repository_check_definition
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
REPO_NAME: xenial REPO_NAME: xenial
repository-check-focal: focal-repository-check:
image: ubuntu:20.04 image: ubuntu:20.04
<<: *repository_check_definition <<: *repository_check_definition
variables: variables:

View File

@ -29,12 +29,16 @@ Calibration (describes B-spline trajectory representation used in camera-IMU cal
## Installation ## Installation
### APT installation for Ubuntu 16.04 and 18.04 (Fast) ### APT installation for Ubuntu 20.04, 18.04 and 16.04 (Fast)
Set up keys Set up keys
``` ```
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0D97B6C9 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0D97B6C9
``` ```
Add the repository to the sources list. On **Ubuntu 18.04** run: Add the repository to the sources list. On **Ubuntu 20.04** run:
```
sudo sh -c 'echo "deb [arch=amd64] http://packages.usenko.eu/ubuntu focal main" > /etc/apt/sources.list.d/basalt.list'
```
On **Ubuntu 18.04** run:
``` ```
sudo sh -c 'echo "deb [arch=amd64] http://packages.usenko.eu/ubuntu bionic main" > /etc/apt/sources.list.d/basalt.list' sudo sh -c 'echo "deb [arch=amd64] http://packages.usenko.eu/ubuntu bionic main" > /etc/apt/sources.list.d/basalt.list'
``` ```
@ -47,7 +51,7 @@ Update the Ubuntu package index and install Basalt:
sudo apt-get update sudo apt-get update
sudo apt-get install basalt sudo apt-get install basalt
``` ```
### Source installation for Ubuntu 18.04 and MacOS >= 10.11 El Capitan ### Source installation for Ubuntu >= 18.04 and MacOS >= 10.14 Mojave
Clone the source code for the project and build it. For MacOS you should have [Homebrew](https://brew.sh/) installed. Clone the source code for the project and build it. For MacOS you should have [Homebrew](https://brew.sh/) installed.
``` ```
git clone --recursive https://gitlab.com/VladyslavUsenko/basalt.git git clone --recursive https://gitlab.com/VladyslavUsenko/basalt.git