From 04a4849967515adb916001e3211240f4ee799b1c Mon Sep 17 00:00:00 2001 From: lmat Date: Tue, 28 Nov 2017 15:47:23 -0500 Subject: [PATCH 1/2] Removing unneeded build flag from docker --- CMakeLists.txt | 1 - util/ci/commonbuild | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f35ac5cdae..fa6a51dd40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,6 @@ OPTION (WITH_GNUCASH "Build all of GnuCash, not just the library" ON) OPTION (WITH_OFX "compile with ofx support (needs LibOFX)" ON) OPTION (WITH_PYTHON "enable python plugin and bindings" OFF) OPTION (ENABLE_BINRELOC "compile with binary relocation support" ON) -OPTION (ENABLE_DEBUG "compile with debugging flags set" OFF) OPTION (ENABLE_REGISTER2 "compile with register2 enabled" OFF) OPTION (DISABLE_NLS "do not use Native Language Support" OFF) OPTION (DISABLE_DEPRECATED_GLIB "don't use deprecated glib functions" OFF) diff --git a/util/ci/commonbuild b/util/ci/commonbuild index 63d4603d60..f314611efc 100644 --- a/util/ci/commonbuild +++ b/util/ci/commonbuild @@ -11,7 +11,7 @@ if [[ "$BUILDTYPE" == "cmake-make" ]]; then make -j 4 make check || ../afterfailure elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then - cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -DENABLE_DEBUG=on -G Ninja + cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -G Ninja ninja ninja check || ../afterfailure; elif [[ "$BUILDTYPE" == "autotools" ]]; then From d599658603917d5c3196006b01296e9a6b1e2cf7 Mon Sep 17 00:00:00 2001 From: lmat Date: Tue, 28 Nov 2017 16:10:28 -0500 Subject: [PATCH 2/2] Removing Arch Linux Autotools build It has failed many times, but to my knowledge the failure has never been legitimate. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fde6ab566e..ea030e040b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ language: c++ compiler: gcc env: - BUILDENV=arch BUILDTYPE=cmake-ninja - - BUILDENV=arch BUILDTYPE=autotools - BUILDENV=ubuntu-14.04 BUILDTYPE=cmake-make - BUILDENV=ubuntu-14.04 BUILDTYPE=autotools services: