Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
DFN2
ocs-manager
Commits
36c517ae
Commit
36c517ae
authored
Aug 29, 2019
by
azubieta
Browse files
Merge branch 'fix_build' into 'master'
use force yes on apt See merge request
dfn2/ocs-manager!1
parents
ed063075
8797ba2c
Pipeline
#902
failed with stage
in 37 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
36c517ae
...
...
@@ -11,5 +11,5 @@ appimage:
-
./scripts/package appimage
artifacts
:
paths
:
-
build_*/ocs-manager*.AppImage
-
build_*/ocs-manager*.AppImage
expire_in
:
2 days
scripts/package
View file @
36c517ae
...
...
@@ -18,20 +18,20 @@ appimage() { # docker-image: ubuntu:14.04
install_build_deps_appimage
()
{
apt update
-qq
apt
-
y
install
curl git
#apt
-y
install build-essential qt5-default libqt5websockets5-dev
apt
-
-force-yes
install
curl git
#apt install build-essential qt5-default libqt5websockets5-dev
#apt -y install cmake automake libtool pkg-config wget desktop-file-utils libglib2.0-dev libcairo2-dev libssl-dev libcurl3 libcurl4-openssl-dev libxpm-dev
apt
-
y
install
libfontconfig1 libfreetype6 libssl1.0.0 zlib1g unzip p7zip unar
apt
-
-force-yes
install
libfontconfig1 libfreetype6 libssl1.0.0 zlib1g unzip p7zip unar
apt
-
y
install
software-properties-common
apt
-
-force-yes
install
software-properties-common
add-apt-repository
-y
ppa:beineri/opt-qt597-trusty
echo
'deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_14.04/ /'
>
/etc/apt/sources.list.d/curl-httponly.list
curl
-fsSL
https://download.opensuse.org/repositories/home:TheAssassin:AppImageLibraries/xUbuntu_14.04/Release.key | apt-key add -
apt update
-qq
apt
-
y
install
build-essential mesa-common-dev libglu1-mesa-dev qt59base qt59websockets
apt
-
-force-yes
install
build-essential mesa-common-dev libglu1-mesa-dev qt59base qt59websockets
curl
-fsSL
https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3-Linux-x86_64.tar.gz |
tar
-xz
--strip-components
=
1
-C
/
apt
-
y
install
automake libtool pkg-config wget desktop-file-utils libglib2.0-dev libcairo2-dev libssl-dev libcurl3 libcurl4-openssl-dev libxpm-dev
apt
-
-force-yes
install
automake libtool pkg-config wget desktop-file-utils libglib2.0-dev libcairo2-dev libssl-dev libcurl3 libcurl4-openssl-dev libxpm-dev
}
build_appimage
()
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment