From 495d8f936113b9252c3e58253779041024bc8f02 Mon Sep 17 00:00:00 2001 From: Alexis Lopez Zubieta <contact@azubieta.net> Date: Mon, 9 Sep 2019 12:41:55 -0500 Subject: [PATCH 1/5] build on ubuntu 16.04 using qt 5.12 --- .gitlab-ci.yml | 2 +- scripts/package | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5cc2c52..6550af1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: appimage: stage: build - image: ubuntu:14.04 + image: ubuntu:16.04 only: - master - /^release\-.+/ diff --git a/scripts/package b/scripts/package index 19d12b0..bf28192 100755 --- a/scripts/package +++ b/scripts/package @@ -15,7 +15,7 @@ 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() { @@ -26,12 +26,12 @@ install_build_deps_appimage() { 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 + add-apt-repository -y ppa:beineri/opt-qt-5.12.3-xenial 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-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 } -- GitLab From 2514d7370521bbda2fcb0081c757f92b053bbdf5 Mon Sep 17 00:00:00 2001 From: Alexis Lopez Zubieta <contact@azubieta.net> Date: Mon, 9 Sep 2019 12:44:53 -0500 Subject: [PATCH 2/5] allow builds on every branch --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6550af1..a792725 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,6 @@ stages: appimage: stage: build image: ubuntu:16.04 - only: - - master - - /^release\-.+/ script: - ./scripts/package appimage artifacts: -- GitLab From 6bb1c5d3d17297dd1187755534d7fc90c45b249d Mon Sep 17 00:00:00 2001 From: Alexis Lopez Zubieta <contact@azubieta.net> Date: Mon, 9 Sep 2019 12:51:26 -0500 Subject: [PATCH 3/5] Use 16.04 AppImageLibraries repo --- scripts/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/package b/scripts/package index bf28192..c4a0c73 100755 --- a/scripts/package +++ b/scripts/package @@ -27,8 +27,8 @@ install_build_deps_appimage() { apt-get -y --force-yes install software-properties-common add-apt-repository -y ppa:beineri/opt-qt-5.12.3-xenial - 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 - + 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 qt512base qt512websockets -- GitLab From 7cfbbe9b86d1d8fe608da7e91cc28b35aa0dfb35 Mon Sep 17 00:00:00 2001 From: Alexis Lopez Zubieta <contact@azubieta.net> Date: Mon, 9 Sep 2019 12:59:54 -0500 Subject: [PATCH 4/5] install xxd --- scripts/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package b/scripts/package index c4a0c73..0d6e4c9 100755 --- a/scripts/package +++ b/scripts/package @@ -20,7 +20,7 @@ appimage() { # docker-image: ubuntu:14.04 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 -- GitLab From c9ca9d11110904b94d5e1b2a7d6072e4ebf74e63 Mon Sep 17 00:00:00 2001 From: Alexis Lopez Zubieta <contact@azubieta.net> Date: Mon, 9 Sep 2019 13:22:29 -0500 Subject: [PATCH 5/5] Fix typo --- app/src/updaters/appimageupdatedialog.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/updaters/appimageupdatedialog.ui b/app/src/updaters/appimageupdatedialog.ui index 70fe2ab..2ca8fdf 100644 --- a/app/src/updaters/appimageupdatedialog.ui +++ b/app/src/updaters/appimageupdatedialog.ui @@ -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> -- GitLab