Fix build break in macos (#3046)

This commit is contained in:
Yufeng Li 2020-02-19 20:42:57 -08:00 committed by GitHub
parent 5e594a070a
commit a8efa42d68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 7 additions and 78 deletions

View file

@ -238,7 +238,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'macOS-10.13'
vmImage: 'macOS-10.14'
strategy:
matrix:
Python35:

View file

@ -54,7 +54,7 @@ jobs:
workspace:
clean: all
pool:
vmImage: 'macOS-10.13'
vmImage: 'macOS-10.14'
steps:
- template: templates/mac-set-variables-and-download.yml
- template: templates/set-version-number-variables-step.yml

View file

@ -1,6 +1,5 @@
jobs:
- template: templates/mac-ci.yml
parameters:
AgentPool : 'Hosted macOS High Sierra'
DoNugetPack: 'false'
BuildCommand: 'python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --build_wheel --skip_submodule_sync --use_automl --parallel --build_shared_lib --build_java --enable_language_interop_ops --enable_onnx_tests --config Debug RelWithDebInfo'

View file

@ -5,7 +5,7 @@ variables:
jobs:
- job: MacOS_CI_Dev
pool:
vmImage: 'macOS-10.13'
vmImage: 'macOS-10.14'
steps:
- template: templates/set-test-data-variables-step.yml
- task: CmdLine@2

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
schedules:
- cron: "0 8 * * *"
displayName: Daily Build

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
schedules:
- cron: "0 10 * * *"
displayName: Daily Build

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
variables:
PackageName: 'Microsoft.ML.OnnxRuntime.MKLML'

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
schedules:
- cron: "0 14 * * *"
displayName: Daily Build

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
variables:
DisableContribOps: 'ON'

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
jobs:
- template: templates/cpu.yml
parameters:

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU-CUDA10'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
schedules:
- cron: "0 8 * * *"
displayName: Daily Build

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU-CUDA10'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
variables:
PackageName: 'Microsoft.ML.OnnxRuntime.Gpu'
TESTONGPU: 'ON'

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
parameters:
DoEsrp: 'false'

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
parameters:
DoEsrp: 'false'

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
parameters:
DoEsrp: 'false'
DoCompliance: 'false'

View file

@ -1,9 +1,3 @@
# Defined as pipeline variables
# variables:
# AgentPoolWin : 'Win-CPU-CUDA10'
# AgentPoolLinux : 'Linux-CPU'
# AgentPoolMacOS : 'macOS-10.13'
parameters:
DoEsrp: 'false'
PackageName: 'Microsoft.ML.OnnxRuntime.Gpu'

View file

@ -6,7 +6,8 @@ jobs:
- job: NuGet_Test_MacOS
workspace:
clean: all
pool: ${{ parameters.AgentPool }}
pool:
vmImage: 'macOS-10.14'
dependsOn:
- NuGet_Packaging
condition: succeeded()

View file

@ -10,7 +10,8 @@ jobs:
workspace:
clean: all
timeoutInMinutes: 120
pool: ${{ parameters.AgentPool }}
pool:
vmImage: 'macOS-10.14'
variables:
BuildCommand: ${{ parameters.BuildCommand }}
steps: