Fix some yaml schema issues

This commit is contained in:
Joseph Donofry 2019-05-17 21:20:31 -04:00
parent f5b9487c8b
commit c9ad2c2df0
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
2 changed files with 4 additions and 5 deletions

View file

@ -1,12 +1,9 @@
parameters:
osName: 'linux'
steps: steps:
- bash: | - bash: |
./.ci/install.sh ./.ci/install.sh
export PATH=/usr/local/bin:${PATH} export PATH=/usr/local/bin:${PATH}
- bash: | - bash: |
export TRAVIS_OS_NAME=${{ osName }}
export CXX=${CXX_COMPILER} export CXX=${CXX_COMPILER}
export CC=${C_COMPILER} export CC=${C_COMPILER}
# Use TRAVIS_TAG if defined, or the short commit SHA otherwise # Use TRAVIS_TAG if defined, or the short commit SHA otherwise

View file

@ -17,7 +17,6 @@ stages:
- job: Linux - job: Linux
pool: pool:
vmImage: 'ubuntu-16.04' vmImage: 'ubuntu-16.04'
variables: variables:
CXX_COMPILER: 'clang++-5.0' CXX_COMPILER: 'clang++-5.0'
C_COMPILER: 'clang-5.0' C_COMPILER: 'clang-5.0'
@ -26,6 +25,7 @@ stages:
USE_BUNDLED_BOOST: '1' USE_BUNDLED_BOOST: '1'
USE_BUNDLED_CMARK: '1' USE_BUNDLED_CMARK: '1'
USE_BUNDLED_JSON: '1' USE_BUNDLED_JSON: '1'
TRAVIS_OS_NAME: 'linux'
steps: steps:
- template: .ci/azure-build.yml - template: .ci/azure-build.yml
parameters: parameters:
@ -39,6 +39,7 @@ stages:
USE_BUNDLED_BOOST: '0' USE_BUNDLED_BOOST: '0'
USE_BUNDLED_CMARK: '0' USE_BUNDLED_CMARK: '0'
USE_BUNDLED_JSON: '0' USE_BUNDLED_JSON: '0'
TRAVIS_OS_NAME: 'osx'
steps: steps:
- template: .ci/azure-build.yml - template: .ci/azure-build.yml
parameters: parameters:
@ -47,7 +48,8 @@ stages:
- job: Windows - job: Windows
pool: pool:
vmImage: 'vs2017-win2016' vmImage: 'vs2017-win2016'
variables:
TRAVIS_OS_NAME: 'windows'
steps: steps:
- template: .ci/azure-build.yml - template: .ci/azure-build.yml
parameters: parameters: