Commit 7d1db270 authored by azubieta's avatar azubieta
Browse files

Merge branch 'build_using_xenial' into 'master'

Build using xenial

See merge request dfn2/ocs-manager!6
parents 4e91d574 c9ca9d11
Pipeline #999 passed with stage
in 9 minutes and 26 seconds
......@@ -3,10 +3,7 @@ stages:
appimage:
stage: build
image: ubuntu:14.04
only:
- master
- /^release\-.+/
image: ubuntu:16.04
script:
- ./scripts/package appimage
artifacts:
......
......@@ -38,7 +38,7 @@ Do you want to download it?</string>
<item>
<widget class="QPushButton" name="latterButton">
<property name="text">
<string>Latter</string>
<string>Later</string>
</property>
</widget>
</item>
......
......@@ -15,23 +15,23 @@ BUILDDIR="${PROJDIR}/build_${PKGNAME}"
appimage() { # docker-image: ubuntu:14.04
install_build_deps_appimage
add_pkguser
su -c "export HOME=/home/${PKGUSER} && source /opt/qt59/bin/qt59-env.sh && "${PKGSCRIPT}" build_appimage" ${PKGUSER}
su -c "export HOME=/home/${PKGUSER} && source /opt/qt512/bin/qt512-env.sh && "${PKGSCRIPT}" build_appimage" ${PKGUSER}
}
install_build_deps_appimage() {
apt-get update -qq
apt-get -y --force-yes install curl git
apt-get -y --force-yes install curl git vim-common
#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-get -y --force-yes install libfontconfig1 libfreetype6 libssl1.0.0 zlib1g unzip p7zip unar
apt-get -y --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 -
add-apt-repository -y ppa:beineri/opt-qt-5.12.3-xenial
echo 'deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_16.04/ /' > /etc/apt/sources.list.d/curl-httponly.list
curl -fsSL https://download.opensuse.org/repositories/home:TheAssassin:AppImageLibraries/xUbuntu_16.04/Release.key | apt-key add -
apt-get update -qq
apt-get -y --force-yes install build-essential mesa-common-dev libglu1-mesa-dev qt59base qt59websockets
apt-get -y --force-yes install build-essential mesa-common-dev libglu1-mesa-dev qt512base qt512websockets
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-get -y --force-yes install automake libtool pkg-config wget desktop-file-utils libglib2.0-dev libcairo2-dev libssl-dev libcurl3 libcurl4-openssl-dev libxpm-dev
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment