Merge pull request #83 from ximion/master

Fix Travis CI
This commit is contained in:
Sebastian Wilzbach 2018-01-18 02:05:54 +01:00 committed by GitHub
commit c1ebca38ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View file

@ -13,22 +13,23 @@ d:
- ldc-beta - ldc-beta
before_install: before_install:
- pyenv global system 3.6
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja python3; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja python3; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip3 install meson; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip3 install meson; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip3 install meson; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip3 install meson; fi
install: install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir .ntmp && curl -L https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip -o .ntmp/ninja-linux.zip; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir .ntmp && curl -L https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip -o .ntmp/ninja-linux.zip; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then unzip .ntmp/ninja-linux.zip -d .ntmp; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then unzip .ntmp/ninja-linux.zip -d .ntmp; fi
before_script: before_script:
- export PATH=$PATH:$PWD/.ntmp - export PATH=$PATH:$PWD/.ntmp
script: script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then meson build && ninja -C build; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then meson build && ninja -j8 -C build; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ninja -C build test -v; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ninja -j8 -C build test -v; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson build && ninja -C build test; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) meson build && ninja -j8 -C build test; fi
- dub build - dub build
- dub test --build=unittest-cov - dub test --build=unittest-cov
after_success: after_success:

View file

@ -1,6 +1,6 @@
project('D-YAML', 'd', project('D-YAML', 'd',
meson_version: '>=0.40.0', meson_version: '>=0.40.0',
subproject_dir: 'contrib/subprojects' subproject_dir: 'contrib'
) )
project_version = '0.6.2' project_version = '0.6.2'