Merge pull request #3284 from lissyx/new-macOS-VMs
Switch to new macOS VM setup
This commit is contained in:
commit
f554ac0b38
|
@ -10,9 +10,6 @@ build:
|
|||
routes: []
|
||||
maxRunTime: 3600
|
||||
docker_image: "ubuntu:16.04"
|
||||
generic:
|
||||
workerType: 'ds-macos-light'
|
||||
workerType: ''
|
||||
system_setup:
|
||||
>
|
||||
true
|
||||
|
|
|
@ -192,3 +192,10 @@ docker:
|
|||
dsTestsBeta: 'ci-ds-tests-b'
|
||||
dsHighMemTests: 'ci-ds-mem-tests'
|
||||
dsHighMemTestsBeta: 'ci-ds-mem-tests-b'
|
||||
macOS:
|
||||
tfBuild: 'ds-macos-tf-build'
|
||||
tfBuildBeta: 'ds-macos-tf-build-b'
|
||||
dsBuild: 'ds-macos-ds-build'
|
||||
dsBuildBeta: 'ds-macos-ds-build-b'
|
||||
dsTests: 'ds-macos-ds-tests'
|
||||
dsTestsBeta: 'ds-macos-ds-tests-b'
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
taskId: ${taskcluster.taskId}
|
||||
provisionerId: ${taskcluster.generic.provisionerId}
|
||||
workerType: ${taskcluster.generic.workerType}
|
||||
workerType: ${macOS.dsBuild}
|
||||
taskGroupId: ${taskcluster.taskGroupId}
|
||||
schedulerId: ${taskcluster.schedulerId}
|
||||
dependencies:
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
taskId: ${taskcluster.taskId}
|
||||
provisionerId: ${taskcluster.generic.provisionerId}
|
||||
workerType: ${build.generic.workerType}
|
||||
workerType: ${build.workerType}
|
||||
taskGroupId: ${taskcluster.taskGroupId}
|
||||
schedulerId: ${taskcluster.schedulerId}
|
||||
dependencies:
|
||||
|
|
|
@ -3,6 +3,7 @@ build:
|
|||
cache:
|
||||
artifact_url: ${system.homebrew_builds.url}
|
||||
artifact_namespace: ${system.homebrew_builds.namespace}
|
||||
workerType: ${macOS.dsBuild}
|
||||
scripts:
|
||||
setup: "taskcluster/tc-true.sh"
|
||||
build: "taskcluster/homebrew-build.sh --builds"
|
||||
|
|
|
@ -3,6 +3,7 @@ build:
|
|||
cache:
|
||||
artifact_url: ${system.homebrew_tests.url}
|
||||
artifact_namespace: ${system.homebrew_tests.namespace}
|
||||
workerType: ${macOS.dsBuild}
|
||||
scripts:
|
||||
setup: "taskcluster/tc-true.sh"
|
||||
build: "taskcluster/homebrew-build.sh --tests"
|
||||
|
|
|
@ -3,6 +3,7 @@ build:
|
|||
cache:
|
||||
artifact_url: ${system.pyenv.osx.url}
|
||||
artifact_namespace: ${system.pyenv.osx.namespace}
|
||||
workerType: ${macOS.dsBuild}
|
||||
scripts:
|
||||
setup: "taskcluster/tc-true.sh"
|
||||
build: "taskcluster/pyenv-build.sh"
|
||||
|
|
|
@ -7,6 +7,7 @@ build:
|
|||
cache:
|
||||
artifact_url: "${system.swig_build.osx.url}"
|
||||
artifact_namespace: "${system.swig_build.osx.namespace}"
|
||||
workerType: ${macOS.dsBuild}
|
||||
scripts:
|
||||
setup: "taskcluster/tc-true.sh"
|
||||
build: "taskcluster/build.sh"
|
||||
|
|
|
@ -2,7 +2,7 @@ $if: '(event.event != "push") && (event.event != "tag")'
|
|||
then:
|
||||
taskId: ${taskcluster.taskId}
|
||||
provisionerId: ${taskcluster.generic.provisionerId}
|
||||
workerType: ${taskcluster.generic.workerType}
|
||||
workerType: ${macOS.dsTests}
|
||||
taskGroupId: ${taskcluster.taskGroupId}
|
||||
schedulerId: ${taskcluster.schedulerId}
|
||||
dependencies:
|
||||
|
|
|
@ -3,8 +3,7 @@ build:
|
|||
cache:
|
||||
artifact_url: ${system.tensorflow.darwin_amd64.url}
|
||||
artifact_namespace: ${system.tensorflow.darwin_amd64.namespace}
|
||||
generic:
|
||||
workerType: "ds-macos-heavy"
|
||||
workerType: ${macOS.tfBuild}
|
||||
scripts:
|
||||
setup: "taskcluster/tf_tc-setup.sh"
|
||||
build: "taskcluster/tf_tc-build.sh --cpu"
|
||||
|
|
|
@ -3,8 +3,7 @@ build:
|
|||
cache:
|
||||
artifact_url: ${system.tensorflow.ios_arm64.url}
|
||||
artifact_namespace: ${system.tensorflow.ios_arm64.namespace}
|
||||
generic:
|
||||
workerType: "ds-macos-heavy"
|
||||
workerType: ${macOS.tfBuild}
|
||||
scripts:
|
||||
setup: "taskcluster/tf_tc-setup.sh"
|
||||
build: "taskcluster/tf_tc-build.sh --ios-arm64"
|
||||
|
|
|
@ -3,8 +3,7 @@ build:
|
|||
cache:
|
||||
artifact_url: ${system.tensorflow.ios_x86_64.url}
|
||||
artifact_namespace: ${system.tensorflow.ios_x86_64.namespace}
|
||||
generic:
|
||||
workerType: "ds-macos-heavy"
|
||||
workerType: ${macOS.tfBuild}
|
||||
scripts:
|
||||
setup: "taskcluster/tf_tc-setup.sh"
|
||||
build: "taskcluster/tf_tc-build.sh --ios-x86_64"
|
||||
|
|
Loading…
Reference in New Issue