mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
Merge #18569: ci: Add big endian native s390x build
6136a96cdf631f824fb89cf2720422787439acc9 ci: Rename RUN_CI_ON_HOST to DANGER_RUN_CI_ON_HOST (Hennadii Stepanov) 97ba77aa8e58c3c7ff767e6ca804d0e46370e5dc ci: Add native s390x (Hennadii Stepanov) Pull request description: Unlike the Docker wrapped solution (#17591) this PR suggests running on host system directly. This approach makes builds quick and stable (see: #18106). The excerpt from the Travis log: ``` ... Running on host system without docker wrapper ... Byte Order: Big Endian ... ``` ACKs for top commit: MarcoFalke: ACK 6136a96cdf631f824fb89cf2720422787439acc9 Tree-SHA512: 1b591de13e38d10a35217e1de11cbd648a359d18d16eed166fac18ea5788b58cc9fc6d407086ed342b99e57e479efd951a0ea693710177e500eb116316b9a788
This commit is contained in:
parent
85be06af39
commit
01fc1af361
@ -37,7 +37,7 @@ task:
|
|||||||
timeout_in: 60m
|
timeout_in: 60m
|
||||||
env:
|
env:
|
||||||
MAKEJOBS: "-j9"
|
MAKEJOBS: "-j9"
|
||||||
RUN_CI_ON_HOST: "1"
|
DANGER_RUN_CI_ON_HOST: "1"
|
||||||
CCACHE_SIZE: "200M"
|
CCACHE_SIZE: "200M"
|
||||||
CCACHE_DIR: "/tmp/ccache_dir"
|
CCACHE_DIR: "/tmp/ccache_dir"
|
||||||
ccache_cache:
|
ccache_cache:
|
||||||
|
31
.travis.yml
31
.travis.yml
@ -32,9 +32,6 @@ cache:
|
|||||||
ccache: true
|
ccache: true
|
||||||
directories:
|
directories:
|
||||||
- $BASE_BUILD_DIR/ci/scratch/.ccache
|
- $BASE_BUILD_DIR/ci/scratch/.ccache
|
||||||
# macOS
|
|
||||||
- $HOME/Library/Caches/Homebrew
|
|
||||||
- /usr/local/Homebrew
|
|
||||||
before_cache:
|
before_cache:
|
||||||
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
|
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
|
||||||
env:
|
env:
|
||||||
@ -212,6 +209,26 @@ after_success:
|
|||||||
FILE_ENV="./ci/test/00_setup_env_arm.sh"
|
FILE_ENV="./ci/test/00_setup_env_arm.sh"
|
||||||
QEMU_USER_CMD=""
|
QEMU_USER_CMD=""
|
||||||
|
|
||||||
|
- stage: test
|
||||||
|
name: 's390x native BE [GOAL: install] [bionic] [no depends, no GUI]'
|
||||||
|
arch: s390x
|
||||||
|
dist: bionic
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- bsdmainutils
|
||||||
|
- libboost-filesystem-dev
|
||||||
|
- libboost-system-dev
|
||||||
|
- libboost-test-dev
|
||||||
|
- libboost-thread-dev
|
||||||
|
- libdb++-dev
|
||||||
|
- libdb-dev
|
||||||
|
- libevent-dev
|
||||||
|
env: >-
|
||||||
|
DANGER_RUN_CI_ON_HOST=true
|
||||||
|
CI_USE_APT_INSTALL=no
|
||||||
|
FILE_ENV="./ci/test/00_setup_env_s390x_host.sh"
|
||||||
|
|
||||||
# s390 build was disabled temporarily because of disk space issues on the Travis VM
|
# s390 build was disabled temporarily because of disk space issues on the Travis VM
|
||||||
#
|
#
|
||||||
# - stage: test
|
# - stage: test
|
||||||
@ -264,6 +281,12 @@ after_success:
|
|||||||
# Xcode 11.3.1, macOS 10.14, SDK 10.15
|
# Xcode 11.3.1, macOS 10.14, SDK 10.15
|
||||||
# https://docs.travis-ci.com/user/reference/osx/#macos-version
|
# https://docs.travis-ci.com/user/reference/osx/#macos-version
|
||||||
osx_image: xcode11.3
|
osx_image: xcode11.3
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- $TRAVIS_BUILD_DIR/ci/scratch/.ccache
|
||||||
|
- $TRAVIS_BUILD_DIR/releases/$HOST
|
||||||
|
- $HOME/Library/Caches/Homebrew
|
||||||
|
- /usr/local/Homebrew
|
||||||
addons:
|
addons:
|
||||||
homebrew:
|
homebrew:
|
||||||
packages:
|
packages:
|
||||||
@ -277,4 +300,6 @@ after_success:
|
|||||||
- ccache
|
- ccache
|
||||||
- zeromq
|
- zeromq
|
||||||
env: >-
|
env: >-
|
||||||
|
DANGER_RUN_CI_ON_HOST=true
|
||||||
|
CI_USE_APT_INSTALL=no
|
||||||
FILE_ENV="./ci/test/00_setup_env_mac_host.sh"
|
FILE_ENV="./ci/test/00_setup_env_mac_host.sh"
|
||||||
|
@ -9,7 +9,6 @@ export LC_ALL=C.UTF-8
|
|||||||
export CONTAINER_NAME=ci_macos
|
export CONTAINER_NAME=ci_macos
|
||||||
export HOST=x86_64-apple-darwin19
|
export HOST=x86_64-apple-darwin19
|
||||||
export PIP_PACKAGES="zmq"
|
export PIP_PACKAGES="zmq"
|
||||||
export RUN_CI_ON_HOST=true
|
|
||||||
export RUN_UNIT_TESTS=true
|
export RUN_UNIT_TESTS=true
|
||||||
export RUN_INTEGRATION_TESTS=false
|
export RUN_INTEGRATION_TESTS=false
|
||||||
export GOAL="install"
|
export GOAL="install"
|
||||||
|
14
ci/test/00_setup_env_s390x_host.sh
Normal file
14
ci/test/00_setup_env_s390x_host.sh
Normal file
@ -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 HOST=s390x-linux-gnu
|
||||||
|
export NO_DEPENDS=1
|
||||||
|
export BITCOIN_CONFIG="--with-incompatible-bdb --enable-reduce-exports"
|
||||||
|
export RUN_UNIT_TESTS=true
|
||||||
|
export RUN_FUNCTIONAL_TESTS=true
|
||||||
|
export GOAL="install"
|
@ -34,7 +34,7 @@ fi
|
|||||||
|
|
||||||
export P_CI_DIR="$PWD"
|
export P_CI_DIR="$PWD"
|
||||||
|
|
||||||
if [ -z "$RUN_CI_ON_HOST" ]; then
|
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
|
||||||
echo "Creating $DOCKER_NAME_TAG container to run in"
|
echo "Creating $DOCKER_NAME_TAG container to run in"
|
||||||
${CI_RETRY_EXE} docker pull "$DOCKER_NAME_TAG"
|
${CI_RETRY_EXE} docker pull "$DOCKER_NAME_TAG"
|
||||||
|
|
||||||
@ -65,7 +65,7 @@ fi
|
|||||||
if [[ $DOCKER_NAME_TAG == centos* ]]; 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 epel-release
|
||||||
${CI_RETRY_EXE} DOCKER_EXEC yum -y install $DOCKER_PACKAGES $PACKAGES
|
${CI_RETRY_EXE} DOCKER_EXEC yum -y install $DOCKER_PACKAGES $PACKAGES
|
||||||
elif [ "$TRAVIS_OS_NAME" != "osx" ]; then
|
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
|
||||||
${CI_RETRY_EXE} DOCKER_EXEC apt-get update
|
${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
|
${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $DOCKER_PACKAGES
|
||||||
fi
|
fi
|
||||||
@ -76,6 +76,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
|||||||
else
|
else
|
||||||
DOCKER_EXEC free -m -h
|
DOCKER_EXEC free -m -h
|
||||||
DOCKER_EXEC echo "Number of CPUs \(nproc\):" \$\(nproc\)
|
DOCKER_EXEC echo "Number of CPUs \(nproc\):" \$\(nproc\)
|
||||||
|
DOCKER_EXEC echo $(lscpu | grep Endian)
|
||||||
DOCKER_EXEC echo "Free disk space:"
|
DOCKER_EXEC echo "Free disk space:"
|
||||||
DOCKER_EXEC df -h
|
DOCKER_EXEC df -h
|
||||||
fi
|
fi
|
||||||
@ -89,7 +90,7 @@ export DIR_FUZZ_IN=${DIR_QA_ASSETS}/fuzz_seed_corpus/
|
|||||||
|
|
||||||
DOCKER_EXEC mkdir -p "${BASE_SCRATCH_DIR}/sanitizer-output/"
|
DOCKER_EXEC mkdir -p "${BASE_SCRATCH_DIR}/sanitizer-output/"
|
||||||
|
|
||||||
if [ -z "$RUN_CI_ON_HOST" ]; then
|
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
|
||||||
echo "Create $BASE_ROOT_DIR"
|
echo "Create $BASE_ROOT_DIR"
|
||||||
DOCKER_EXEC rsync -a /ro_base/ $BASE_ROOT_DIR
|
DOCKER_EXEC rsync -a /ro_base/ $BASE_ROOT_DIR
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user