From c9ad2c2df06654806e0dfbf191029755d2ab586f Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Fri, 17 May 2019 21:20:31 -0400 Subject: [PATCH] Fix some yaml schema issues --- .ci/azure-build.yml | 3 --- azure-pipelines.yml | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.ci/azure-build.yml b/.ci/azure-build.yml index 45147fe8..38714c4a 100644 --- a/.ci/azure-build.yml +++ b/.ci/azure-build.yml @@ -1,12 +1,9 @@ -parameters: - osName: 'linux' steps: - bash: | ./.ci/install.sh export PATH=/usr/local/bin:${PATH} - bash: | - export TRAVIS_OS_NAME=${{ osName }} export CXX=${CXX_COMPILER} export CC=${C_COMPILER} # Use TRAVIS_TAG if defined, or the short commit SHA otherwise diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1524e7ee..51f2627f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,6 @@ stages: - job: Linux pool: vmImage: 'ubuntu-16.04' - variables: CXX_COMPILER: 'clang++-5.0' C_COMPILER: 'clang-5.0' @@ -26,6 +25,7 @@ stages: USE_BUNDLED_BOOST: '1' USE_BUNDLED_CMARK: '1' USE_BUNDLED_JSON: '1' + TRAVIS_OS_NAME: 'linux' steps: - template: .ci/azure-build.yml parameters: @@ -39,6 +39,7 @@ stages: USE_BUNDLED_BOOST: '0' USE_BUNDLED_CMARK: '0' USE_BUNDLED_JSON: '0' + TRAVIS_OS_NAME: 'osx' steps: - template: .ci/azure-build.yml parameters: @@ -47,7 +48,8 @@ stages: - job: Windows pool: vmImage: 'vs2017-win2016' - + variables: + TRAVIS_OS_NAME: 'windows' steps: - template: .ci/azure-build.yml parameters: