From 93820c2aab998172aa847185263dfa7b5d7e4214 Mon Sep 17 00:00:00 2001 From: tkashkin Date: Mon, 9 Nov 2020 00:41:31 +0300 Subject: [PATCH] Update CI build script (#435) Former-commit-id: b4e6e7c77dd7c43d60c948ba5a38542e742b4ae4 --- debian/control | 10 ++++++---- scripts/build.sh | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 778c51ca..8406c232 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: com.github.tkashkin.gamehub Section: x11 Priority: optional Maintainer: tkashkin -Build-Depends: meson (>= 0.40), - valac (>= 0.16), - debhelper (>= 9), +Build-Depends: meson, + valac, + debhelper, libgtk-3-dev, libglib2.0-dev, libwebkit2gtk-4.0-dev, @@ -14,7 +14,9 @@ Build-Depends: meson (>= 0.40), libsqlite3-dev, libxml2-dev, libpolkit-gobject-1-dev, - libx11-dev, libmanette-0.2-dev, libxtst-dev + libx11-dev, + libmanette-0.2-dev, + libxtst-dev Standards-Version: 4.1.4 Package: com.github.tkashkin.gamehub diff --git a/scripts/build.sh b/scripts/build.sh index 1011b10e..311c9311 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -25,8 +25,8 @@ export CFLAGS="$CFLAGS -O0" export DEB_BUILD_OPTIONS="noopt nostrip nocheck" if [[ "$APPVEYOR_BUILD_WORKER_IMAGE" = "Ubuntu2004" ]]; then - _DEB_TARGET_DISTRO_NAMES=("bionic" "focal" "groovy" "hirsute") - _DEB_TARGET_DISTRO_VERSIONS=("18.04" "20.04" "20.10" "21.04") + _DEB_TARGET_DISTRO_NAMES=("focal" "bionic" "groovy" "hirsute") + _DEB_TARGET_DISTRO_VERSIONS=("20.04" "18.04" "20.10" "21.04") _BUILD_IMAGE="focal" else source "/etc/os-release" @@ -94,7 +94,7 @@ deps() sudo DEBIAN_FRONTEND="noninteractive" add-apt-repository ppa:vala-team/next -y sudo DEBIAN_FRONTEND="noninteractive" add-apt-repository ppa:savoury1/build-tools -y sudo DEBIAN_FRONTEND="noninteractive" apt update -qq - sudo DEBIAN_FRONTEND="noninteractive" apt install -y meson valac checkinstall build-essential dput fakeroot moreutils git-buildpackage libgtk-3-dev libglib2.0-dev libwebkit2gtk-4.0-dev libjson-glib-dev libgee-0.8-dev libsoup2.4-dev libsqlite3-dev libxml2-dev libpolkit-gobject-1-dev libmanette-0.2-dev libxtst-dev libx11-dev + sudo DEBIAN_FRONTEND="noninteractive" apt install -y meson valac checkinstall build-essential debhelper dput fakeroot moreutils git-buildpackage libgtk-3-dev libglib2.0-dev libwebkit2gtk-4.0-dev libjson-glib-dev libgee-0.8-dev libsoup2.4-dev libsqlite3-dev libxml2-dev libpolkit-gobject-1-dev libmanette-0.2-dev libxtst-dev libx11-dev } gen_changelogs()