Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
wolf_scripts
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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_scripts
Commits
53e45791
Commit
53e45791
authored
1 year ago
by
Joan Vallvé Navarro
Browse files
Options
Downloads
Plain Diff
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
!2
Resolve "ubuntu 22 and CMAKE 3.16"
Pipeline
#18269
passed
1 year ago
Stage: bionic
Stage: focal
Stage: jammy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+10
-18
10 additions, 18 deletions
.gitlab-ci.yml
install_wolf.sh
+18
-5
18 additions, 5 deletions
install_wolf.sh
with
28 additions
and
23 deletions
.gitlab-ci.yml
+
10
−
18
View file @
53e45791
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
:
inst
al
l
stage
:
foc
al
cache
:
[]
cache
:
[]
image
:
ubuntu:20.04
image
:
ubuntu:20.04
script
:
script
:
-
*script_install_definition
-
*script_install_definition
-
*script_test_definition
-
*script_test_definition
l
in
t
-test-j
ob
:
in
stallation
-test-j
ammy
:
stage
:
test
stage
:
jammy
cache
:
[]
cache
:
[]
image
:
ubuntu:2
0
.04
image
:
ubuntu:2
2
.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
This diff is collapsed.
Click to expand it.
install_wolf.sh
+
18
−
5
View file @
53e45791
...
@@ -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
...
...
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