fix CI failures due to Meson and DMDM nighlies (#17)

This commit is contained in:
BBasile 2018-09-30 09:45:11 +02:00 committed by GitHub
parent 056a005f54
commit 0a380b0d7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 23 deletions

View file

@ -7,18 +7,18 @@ os:
- osx - osx
d: d:
- dmd - dmd
- dmd-beta #- dmd-beta
- dmd-nightly #- dmd-nightly
- ldc - ldc
- ldc-beta #- ldc-beta
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pyenv global system 3.6; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pyenv global system 3.6; fi
- 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; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip3 install meson; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then pip3 install 'meson==0.47.2'; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip3 install meson; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip3 install 'meson==0.47.2'; fi
install: install:
- 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 mkdir .ntmp && curl -L https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip -o .ntmp/ninja-linux.zip; fi

View file

@ -1,30 +1,30 @@
platform: x64 platform: x64
environment: environment:
matrix: matrix:
- DC: dmd #- DC: dmd
DVersion: nightly # DVersion: nightly
arch: x64 # arch: x64
- DC: dmd #- DC: dmd
DVersion: nightly # DVersion: nightly
arch: x86 # arch: x86
- DC: dmd #- DC: dmd
DVersion: beta # DVersion: beta
arch: x64 # arch: x64
- DC: dmd #- DC: dmd
DVersion: beta # DVersion: beta
arch: x86 # arch: x86
- DC: dmd - DC: dmd
DVersion: stable DVersion: stable
arch: x64 arch: x64
- DC: dmd - DC: dmd
DVersion: stable DVersion: stable
arch: x86 arch: x86
- DC: ldc #- DC: ldc
DVersion: beta # DVersion: beta
arch: x86 # arch: x86
- DC: ldc #- DC: ldc
DVersion: beta # DVersion: beta
arch: x64 # arch: x64
- DC: ldc - DC: ldc
DVersion: stable DVersion: stable
arch: x86 arch: x86