ci(github): switch AppImage build to Ubuntu 20.04

This commit is contained in:
Oleg Shparber 2020-09-05 23:22:51 -04:00 committed by Oleg Shparber
parent 043952f6fc
commit 09b13359c9
3 changed files with 22 additions and 28 deletions

View File

@ -1,8 +1,8 @@
FROM ubuntu:bionic
FROM ubuntu:focal
RUN apt-get update -q -y \
# Install appimage-builder and appimagetool dependencies.
&& apt-get install -q -y --no-install-recommends \
&& DEBIAN_FRONTEND="noninteractive" apt-get install -q -y --no-install-recommends \
appstream curl desktop-file-utils fakeroot file git gnupg patchelf zsync \
python3-pip python3-setuptools python3-wheel \
&& \

View File

@ -114,9 +114,9 @@ jobs:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
useVcpkgToolchainFile: true
appimage:
build-appimage:
name: AppImage
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Checkout
@ -139,14 +139,14 @@ jobs:
qtwebengine5-dev
- name: Upload AppImage
uses: actions/upload-artifact@v2-preview
uses: actions/upload-artifact@v2
with:
name: zeal-dev-x86_64.AppImage # TODO: Provide real version.
path: zeal-*.AppImage
# TODO: Enable for releases.
- name: Upload AppImage.zsync
uses: actions/upload-artifact@v2-preview
uses: actions/upload-artifact@v2
if: github.event_name == 'create' && github.event.ref_type == 'tag' && startsWith(github.ref, 'v')
with:
name: zeal-dev-x86_64.AppImage.zsync

View File

@ -1,13 +1,9 @@
version: 1
script:
- mkdir -p build.appimage
# TODO: Use cmake -B build.appimage after updating to CMake v3.14, and also:
# - cmake --build build.appimage
# - cmake --prefix /tmp/AppDir --install build.appimage
- cd build.appimage; cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
- cd build.appimage; ninja
- cd build.appimage; DESTDIR=AppDir ninja install
- cmake -B build.appimage -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo
- cmake --build build.appimage
- cmake --install build.appimage --prefix build.appimage/AppDir/usr
AppDir:
path: build.appimage/AppDir
@ -21,32 +17,30 @@ AppDir:
exec_args: $@
runtime:
generator: wrapper
APPDIR_LIBRARY_PATH: "$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu"
env:
APPDIR_LIBRARY_PATH: $APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib/x86_64-linux-gnu
apt:
arch: amd64
sources:
- sourceline: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse"
- sourceline: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse"
- sourceline: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse"
key_url: "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32"
- sourceline: deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
- sourceline: deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
- sourceline: deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32
include:
# Required Qt packages.
- libqt5concurrent5
- libqt5gui5
- libqt5network5
- libqt5x11extras5
- libqt5concurrent5
- libqt5webchannel5
- libqt5webengine5
- libqt5webenginewidgets5
- libqt5widgets5
- libqt5x11extras5
- qtwayland5
# Other dependencies.
- libsqlite3-0
- libarchive13
exclude:
- "*dbgsym*"
- gnupg
@ -71,9 +65,9 @@ AppDir:
- usr/bin/systemd*
- usr/bin/dpkg*
- usr/bin/*-linux-gnu-*
- usr/share/locale
#- usr/share/locale
AppImage:
arch: "x86_64"
update-information: "gh-releases-zsync|zealdocs|zeal|latest|zeal-*x86_64.AppImage.zsync"
arch: x86_64
update-information: gh-releases-zsync|zealdocs|zeal|latest|zeal-*x86_64.AppImage.zsync
sign-key: None