diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-11-08 09:48:29 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-09 10:15:59 +0100 |
commit | 3333d6942e8c5d823b97ea51ef88c8a0791742c6 (patch) | |
tree | effe6abba24742f634920917f670b5804b1cabaa | |
parent | fa8b1114e60100f503673ccc7ef5618851c0c9e3 (diff) |
ci: Run macos ci config on cirrus
-rw-r--r-- | .cirrus.yml | 16 | ||||
-rw-r--r-- | .travis.yml | 21 | ||||
-rw-r--r-- | ci/test/00_setup_env_mac_host.sh | 4 | ||||
-rwxr-xr-x | ci/test/04_install.sh | 2 |
4 files changed, 16 insertions, 27 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1f21c50a62..e00c1b7385 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,7 +8,7 @@ container: memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers kvm: true # Use kvm to avoid spurious CI failures in the default virtualization cluster, see https://github.com/bitcoin/bitcoin/issues/20093 env: - PACKAGE_MANAGER_INSTALL : "apt-get update && apt-get install -y" + PACKAGE_MANAGER_INSTALL: "apt-get update && apt-get install -y" MAKEJOBS: "-j4" DANGER_RUN_CI_ON_HOST: "1" # Containers will be discarded after the run, so there is no risk that the ci scripts modify the system TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache @@ -127,3 +127,17 @@ task: image: ubuntu:bionic env: FILE_ENV: "./ci/test/00_setup_env_mac.sh" + +task: + name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]' + macos_brew_addon_script: + - brew install boost libevent berkeley-db4 qt miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt + << : *GLOBAL_TASK_TEMPLATE + osx_instance: + # Use latest image, but hardcode version to avoid silent upgrades (and breaks) + image: catalina-xcode-12.1 # https://cirrus-ci.org/guide/macOS + env: + DANGER_RUN_CI_ON_HOST: "true" + CI_USE_APT_INSTALL: "no" + PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do + FILE_ENV: "./ci/test/00_setup_env_mac_host.sh" diff --git a/.travis.yml b/.travis.yml index a06e9a14ab..f1f695d2b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,24 +79,3 @@ jobs: name: 'x86_64 Linux [GOAL: install] [xenial] [no wallet]' env: >- FILE_ENV="./ci/test/00_setup_env_native_nowallet.sh" - - - stage: test - name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]' - os: osx - # Use the most recent version: - # Xcode 11.3.1, macOS 10.14, SDK 10.15 - # https://docs.travis-ci.com/user/reference/osx/#macos-version - osx_image: xcode11.3 - addons: - homebrew: - packages: - - berkeley-db4 - - miniupnpc - - qrencode - - sqlite - - ccache - - zeromq - env: >- - DANGER_RUN_CI_ON_HOST=true - CI_USE_APT_INSTALL=no - FILE_ENV="./ci/test/00_setup_env_mac_host.sh" diff --git a/ci/test/00_setup_env_mac_host.sh b/ci/test/00_setup_env_mac_host.sh index a2e3af887c..7c25a34cfe 100644 --- a/ci/test/00_setup_env_mac_host.sh +++ b/ci/test/00_setup_env_mac_host.sh @@ -16,7 +16,3 @@ export OSX_SDK="" export CCACHE_SIZE=300M export RUN_SECURITY_TESTS="true" -if [ "$TRAVIS_REPO_SLUG" != "bitcoin/bitcoin" ]; then - export RUN_FUNCTIONAL_TESTS="false" - export EXPECTED_TESTS_DURATION_IN_SECONDS=200 -fi diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index b0f802186d..ea3e7bcd4e 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -14,7 +14,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then fi if [ "$CI_OS_NAME" == "macos" ]; then - ${CI_RETRY_EXE} pip3 install $PIP_PACKAGES + IN_GETOPT_BIN="/usr/local/opt/gnu-getopt/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES fi # Create folders that are mounted into the docker |