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

Merge branch '1-ubuntu-22-and-cmake-3-16' into 'main'

Resolve "ubuntu 22 and CMAKE 3.16"

Closes #1

See merge request !2
parents 6cca4ac1 0a81f986
No related branches found
No related tags found
1 merge request!2Resolve "ubuntu 22 and CMAKE 3.16"
Pipeline #18269 passed
stages: # List of stages for jobs, and their order of execution stages: # List of stages for jobs, and their order of execution
- install - bionic
- test - focal
- jammy
############ YAML ANCHORS ############ ############ YAML ANCHORS ############
.script_gcc5_template: &script_gcc5_definition
- apt-get update -y
- apt-get install software-properties-common -y
- add-apt-repository ppa:ubuntu-toolchain-r/test -y
- apt-get update -y
- apt-get install gcc-snapshot -y
- apt-get install gcc-5 g++-5 -y
.script_install_template: &script_install_definition .script_install_template: &script_install_definition
- apt-get update -y && apt-get install -y expect - apt-get update -y && apt-get install -y expect
- ./install_wolf.sh -a -f y -c y -d . -w . - ./install_wolf.sh -a -f y -c y -d . -w .
...@@ -33,7 +26,7 @@ stages: # List of stages for jobs, and their order of execution ...@@ -33,7 +26,7 @@ stages: # List of stages for jobs, and their order of execution
############ JOBS ############ ############ JOBS ############
installation-test-bionic: installation-test-bionic:
stage: install stage: bionic
cache: [] cache: []
image: ubuntu:18.04 image: ubuntu:18.04
script: script:
...@@ -41,18 +34,17 @@ installation-test-bionic: ...@@ -41,18 +34,17 @@ installation-test-bionic:
- *script_test_definition - *script_test_definition
installation-test-focal: installation-test-focal:
stage: install stage: focal
cache: [] cache: []
image: ubuntu:20.04 image: ubuntu:20.04
script: script:
- *script_install_definition - *script_install_definition
- *script_test_definition - *script_test_definition
lint-test-job: installation-test-jammy:
stage: test stage: jammy
cache: [] cache: []
image: ubuntu:20.04 image: ubuntu:22.04
script: script:
- echo "Linting code... This will take about 10 seconds." - *script_install_definition
- sleep 10 - *script_test_definition
- echo "No lint issues found." \ No newline at end of file
\ No newline at end of file
...@@ -186,6 +186,8 @@ if [ $UBUNTU_DISTRO == "18.04" ]; then ...@@ -186,6 +186,8 @@ if [ $UBUNTU_DISTRO == "18.04" ]; then
func_echo "Ubuntu 18.04 - OK" func_echo "Ubuntu 18.04 - OK"
elif [ $UBUNTU_DISTRO == "20.04" ]; then elif [ $UBUNTU_DISTRO == "20.04" ]; then
func_echo "Ubuntu 20.04 - OK" func_echo "Ubuntu 20.04 - OK"
elif [ $UBUNTU_DISTRO == "22.04" ]; then
func_echo "Ubuntu 22.04 - OK"
else else
func_echo_error "Non-supported Ubuntu version: ${UBUNTU_DISTRO}" func_echo_error "Non-supported Ubuntu version: ${UBUNTU_DISTRO}"
exit 1 exit 1
...@@ -209,12 +211,23 @@ func_echo "path dependencies: $DEPS_PATH" ...@@ -209,12 +211,23 @@ func_echo "path dependencies: $DEPS_PATH"
func_echo "Installing dependencies via apt install..." func_echo "Installing dependencies via apt install..."
if [ "$UID" -eq 0 -o "$EUID" -eq 0 ]; then # install packages (apt & pip)
#apt install -y git wget unzip dh-autoreconf cmake build-essential libgoogle-glog-dev libgflags-dev libatlas-base-dev libsuitesparse-dev git libboost-all-dev libyaml-cpp-dev wget unzip if [ $UBUNTU_DISTRO == "18.04" ]; then # Ensure required CMAKE version with pip in ubuntu 18.04
apt install -y git wget unzip cmake build-essential libeigen3-dev libgoogle-glog-dev libgflags-dev libatlas-base-dev libsuitesparse-dev git libboost-all-dev libyaml-cpp-dev wget unzip if [ "$UID" -eq 0 -o "$EUID" -eq 0 ]; then
apt install -y git wget unzip python-pip build-essential libeigen3-dev libgoogle-glog-dev libgflags-dev libatlas-base-dev libsuitesparse-dev git libboost-all-dev libyaml-cpp-dev wget unzip
pip install --upgrade pip
pip install cmake==3.16.*
else
sudo apt install -y git wget unzip python-pip build-essential libeigen3-dev libgoogle-glog-dev libgflags-dev libatlas-base-dev libsuitesparse-dev git libboost-all-dev libyaml-cpp-dev wget unzip
sudo pip install --upgrade pip
sudo pip install cmake==3.16.*
fi
else else
#sudo apt install -y git wget unzip dh-autoreconf cmake build-essential libgoogle-glog-dev libgflags-dev libatlas-base-dev libsuitesparse-dev git libboost-all-dev libyaml-cpp-dev wget unzip if [ "$UID" -eq 0 -o "$EUID" -eq 0 ]; then
sudo apt install -y git wget unzip cmake build-essential libeigen3-dev libgoogle-glog-dev libgflags-dev libatlas-base-dev libsuitesparse-dev git libboost-all-dev libyaml-cpp-dev wget unzip apt install -y git wget unzip cmake build-essential libeigen3-dev libgoogle-glog-dev libgflags-dev libatlas-base-dev libsuitesparse-dev git libboost-all-dev libyaml-cpp-dev wget unzip
else
sudo apt install -y git wget unzip cmake build-essential libeigen3-dev libgoogle-glog-dev libgflags-dev libatlas-base-dev libsuitesparse-dev git libboost-all-dev libyaml-cpp-dev wget unzip
fi
fi fi
# ceres # ceres
......
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