From dfa98d2bec13c9a15fe3762ade160e59e64c335d Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Tue, 16 Mar 2021 18:18:26 +0100 Subject: [PATCH] CI: run make distcheck See osdn #41799 --- .github/workflows/ci.yml | 10 +++++++++- scripts/ci-build.sh | 8 ++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d72dc8273c..3df2fede95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -115,6 +115,7 @@ jobs: sudo apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \ libtolua-dev \ + zip \ gettext \ libcurl4-openssl-dev \ libtool \ @@ -124,7 +125,14 @@ jobs: python3.7 \ liblzma-dev \ libicu-dev \ - libsqlite3-dev + libsqlite3-dev \ + libgtk-3-dev \ + qt5-default \ + libsdl2-mixer-dev \ + libsdl2-gfx-dev \ + libsdl2-image-dev \ + libsdl2-ttf-dev \ + libmysqlclient-dev - name: build shell: bash run: ./scripts/ci-build.sh dist diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 92e8c6bb9e..0adba6f599 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -20,16 +20,12 @@ case $1 in mkdir build cd build ../autogen.sh \ - --disable-client \ - --disable-fcmp \ - --disable-ruledit \ - --disable-server \ || (let config_exit_status=$? \ && echo "Config exit status: $config_exit_status" \ && cat config.log \ && exit $config_exit_status) -make -s -j$(nproc) dist -echo "Freeciv distribution build successful!" +make -s -j$(nproc) distcheck +echo "Freeciv distribution check successful!" ;; "meson") -- 2.20.1