Skip to content

Commit

Permalink
ci: Use Homebrew addon on native macOS
Browse files Browse the repository at this point in the history
Also the macOS image has been updated.
  • Loading branch information
hebasto committed Mar 26, 2020
1 parent 596c627 commit 25c8b73
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 22 deletions.
16 changes: 14 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,20 @@ jobs:
name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
os: osx
# Use the most recent version:
# Xcode 11.2.1, macOS 10.14, JDK 13.0.1, SDK 10.15
# Xcode 11.3.1, macOS 10.14, SDK 10.15
# https://docs.travis-ci.com/user/reference/osx/#macos-version
osx_image: xcode11.2
osx_image: xcode11.3
addons:
homebrew:
packages:
- libtool
- berkeley-db4
- boost
- miniupnpc
- qt
- qrencode
- python3
- ccache
- zeromq
env: >-
FILE_ENV="./ci/test/00_setup_env_mac_host.sh"
1 change: 0 additions & 1 deletion ci/test/00_setup_env_mac_host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
export LC_ALL=C.UTF-8

export HOST=x86_64-apple-darwin16
export BREW_PACKAGES="automake berkeley-db4 libtool boost miniupnpc pkg-config qt qrencode python3 ccache zeromq"
export PIP_PACKAGES="zmq"
export RUN_CI_ON_HOST=true
export RUN_UNIT_TESTS=true
Expand Down
19 changes: 0 additions & 19 deletions ci/test/04_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,8 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
fi

if [ "$TRAVIS_OS_NAME" == "osx" ]; then
set +o errexit
pushd /usr/local/Homebrew || exit 1
git reset --hard origin/master
popd || exit 1
set -o errexit
${CI_RETRY_EXE} brew update
# brew upgrade returns an error if any of the packages is already up to date
# Failure is safe to ignore, unless we really need an update.
brew upgrade $BREW_PACKAGES || true

# install new packages (brew install returns an error if already installed)
for i in $BREW_PACKAGES; do
if ! brew list | grep -q $i; then
${CI_RETRY_EXE} brew install $i
fi
done

export PATH="/usr/local/opt/ccache/libexec:$PATH"

${CI_RETRY_EXE} pip3 install $PIP_PACKAGES

fi

mkdir -p "${BASE_SCRATCH_DIR}"
Expand Down

0 comments on commit 25c8b73

Please sign in to comment.