mirror of
https://github.com/open-source-parsers/jsoncpp.git
synced 2025-01-19 00:46:02 +01:00
ENH: Use recommended homebrew addon for travis.
Remove unnecessary python3 environment from osx that made configuring the test environment slower. Use "addon:" features for installing homebrew packages more efficiently. Re-organized the .travis.yml file in a standard order so that the "before-install" and "install" steps occur after the configurations of addons and matrix, and language features are set.
This commit is contained in:
parent
f8ad1ab352
commit
fa61a49b83
23
.travis.yml
23
.travis.yml
@ -5,12 +5,12 @@
|
|||||||
# See also
|
# See also
|
||||||
# http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c11/30925448#30925448
|
# http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c11/30925448#30925448
|
||||||
# to allow C++11, though we are not yet building with -std=c++11
|
# to allow C++11, though we are not yet building with -std=c++11
|
||||||
|
language: cpp
|
||||||
before_install:
|
sudo: false
|
||||||
- source travis.before_install.${TRAVIS_OS_NAME}.sh
|
|
||||||
install:
|
|
||||||
- source travis.install.${TRAVIS_OS_NAME}.sh
|
|
||||||
addons:
|
addons:
|
||||||
|
homebrew:
|
||||||
|
packages: meson ninja
|
||||||
|
update: false # do not update homebrew by default
|
||||||
apt:
|
apt:
|
||||||
sources:
|
sources:
|
||||||
#- ubuntu-toolchain-r-test
|
#- ubuntu-toolchain-r-test
|
||||||
@ -20,16 +20,16 @@ addons:
|
|||||||
#- g++-4.9
|
#- g++-4.9
|
||||||
- clang-3.5
|
- clang-3.5
|
||||||
- valgrind
|
- valgrind
|
||||||
language: cpp
|
|
||||||
script: ./travis.sh
|
|
||||||
matrix:
|
matrix:
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- os: osx
|
- os: osx
|
||||||
matrix:
|
|
||||||
include:
|
include:
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode9.4
|
osx_image: xcode9.4
|
||||||
compiler: clang
|
compiler: clang
|
||||||
|
addons:
|
||||||
|
homebrew:
|
||||||
|
packages: meson ninja
|
||||||
#env: PYENV_ROOT=/usr/local/var/pyenv
|
#env: PYENV_ROOT=/usr/local/var/pyenv
|
||||||
env: LIB_TYPE=static BUILD_TYPE=release HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp
|
env: LIB_TYPE=static BUILD_TYPE=release HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp
|
||||||
#- LIB_TYPE=shared BUILD_TYPE=debug
|
#- LIB_TYPE=shared BUILD_TYPE=debug
|
||||||
@ -39,4 +39,9 @@ matrix:
|
|||||||
env: LIB_TYPE=static BUILD_TYPE=release
|
env: LIB_TYPE=static BUILD_TYPE=release
|
||||||
notifications:
|
notifications:
|
||||||
email: false
|
email: false
|
||||||
sudo: false
|
|
||||||
|
before_install:
|
||||||
|
- source ./travis.before_install.${TRAVIS_OS_NAME}.sh
|
||||||
|
install:
|
||||||
|
- source ./travis.install.${TRAVIS_OS_NAME}.sh
|
||||||
|
script: ./travis.sh
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
set -vex
|
# NOTHING TO DO HERE
|
||||||
|
# set -vex
|
||||||
|
|
||||||
#brew install pyenv
|
#brew install pyenv
|
||||||
#which pyenv
|
#which pyenv
|
||||||
|
@ -1,12 +1,5 @@
|
|||||||
set -vex
|
# NOTHING TO DO HERE
|
||||||
|
# set -vex
|
||||||
|
|
||||||
#brew update
|
#python3 -m venv venv
|
||||||
brew upgrade python3
|
#source venv/bin/activate
|
||||||
python3 -m venv venv
|
|
||||||
source venv/bin/activate
|
|
||||||
|
|
||||||
brew install ninja
|
|
||||||
brew install meson
|
|
||||||
|
|
||||||
#brew install pyenv
|
|
||||||
#which pyenv
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user