From 7f3ae224685efaeb6fe714de90e8871d12e55f34 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 29 Nov 2019 21:46:49 +0200 Subject: [PATCH 1/2] ci: Add CentOS 7 build --- .travis.yml | 5 +++++ ci/test/00_setup_env_native_centos.sh | 14 ++++++++++++++ ci/test/04_install.sh | 9 ++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 ci/test/00_setup_env_native_centos.sh diff --git a/.travis.yml b/.travis.yml index 6612d5e4d11..63b76605f64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,6 +118,11 @@ jobs: env: >- FILE_ENV="./ci/test/00_setup_env_i686.sh" + - stage: test + name: 'x86_64 Linux [GOAL: install] [CentOS 7] [no depends, only system libs]' + env: >- + FILE_ENV="./ci/test/00_setup_env_native_centos.sh" + - stage: test name: 'x86_64 Linux [GOAL: install] [bionic] [uses qt5 dev package instead of depends Qt to speed up build and avoid timeout] [unsigned char]' env: >- diff --git a/ci/test/00_setup_env_native_centos.sh b/ci/test/00_setup_env_native_centos.sh new file mode 100644 index 00000000000..56b915b6c7b --- /dev/null +++ b/ci/test/00_setup_env_native_centos.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2019 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + +export LC_ALL=C.UTF-8 + +export DOCKER_NAME_TAG=centos:7 +export DOCKER_PACKAGES="gcc-c++ libtool make git python3 python36-zmq" +export PACKAGES="boost-devel libevent-devel libdb4-devel libdb4-cxx-devel miniupnpc-devel zeromq-devel qt5-qtbase-devel qt5-qttools-devel qrencode-devel" +export NO_DEPENDS=1 +export GOAL="install" +export BITCOIN_CONFIG="--enable-reduce-exports" diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index ce41c37b6e9..318ee94fde1 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -6,6 +6,10 @@ export LC_ALL=C.UTF-8 +if [[ $DOCKER_NAME_TAG == centos* ]]; then + export LC_ALL=en_US.utf8 +fi + if [ "$TRAVIS_OS_NAME" == "osx" ]; then set +o errexit pushd /usr/local/Homebrew || exit 1 @@ -78,7 +82,10 @@ if [ -n "$DPKG_ADD_ARCH" ]; then DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH" fi -if [ "$TRAVIS_OS_NAME" != "osx" ]; then +if [[ $DOCKER_NAME_TAG == centos* ]]; then + ${CI_RETRY_EXE} DOCKER_EXEC yum -y install epel-release + ${CI_RETRY_EXE} DOCKER_EXEC yum -y install $DOCKER_PACKAGES $PACKAGES +elif [ "$TRAVIS_OS_NAME" != "osx" ]; then ${CI_RETRY_EXE} DOCKER_EXEC apt-get update ${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $DOCKER_PACKAGES fi From 711e0449cf4a0f15cabe0d64094e3add24ad44b0 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 6 Dec 2019 21:52:02 +0200 Subject: [PATCH 2/2] ci: Remove trusty build Co-authored-by: Emil Engler --- .travis.yml | 5 ----- ci/test/00_setup_env_native_trusty.sh | 14 -------------- 2 files changed, 19 deletions(-) delete mode 100644 ci/test/00_setup_env_native_trusty.sh diff --git a/.travis.yml b/.travis.yml index 63b76605f64..bfb4cb1d586 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,11 +128,6 @@ jobs: env: >- FILE_ENV="./ci/test/00_setup_env_native_qt5.sh" - - stage: test - name: 'x86_64 Linux [GOAL: install] [trusty] [no functional tests, no depends, only system libs]' - env: >- - FILE_ENV="./ci/test/00_setup_env_native_trusty.sh" - - stage: test name: 'x86_64 Linux [GOAL: install] [xenial] [no depends, only system libs, sanitizers: thread (TSan), no wallet]' env: >- diff --git a/ci/test/00_setup_env_native_trusty.sh b/ci/test/00_setup_env_native_trusty.sh deleted file mode 100644 index 893c1f6b53c..00000000000 --- a/ci/test/00_setup_env_native_trusty.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2019 The Bitcoin Core developers -# Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. - -export LC_ALL=C.UTF-8 - -export DOCKER_NAME_TAG=ubuntu:14.04 -export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libicu-dev libpng-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.1++-dev libzmq3-dev libqrencode-dev" -export NO_DEPENDS=1 -export RUN_FUNCTIONAL_TESTS=false -export GOAL="install" -export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no"