diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml index ef68ef335..9a9c97caf 100644 --- a/script/vsts/nightly-release.yml +++ b/script/vsts/nightly-release.yml @@ -1,6 +1,6 @@ -phases: +jobs: -- phase: GetReleaseVersion +- job: GetReleaseVersion steps: # This has to be done separately because VSTS inexplicably # exits the script block after `npm install` completes. @@ -16,8 +16,9 @@ phases: - template: platforms/macos.yml - template: platforms/linux.yml -- phase: Release - queue: Hosted # Need this for Python 2.7 +- job: Release + pool: + vmImage: vs2017-win2016 dependsOn: - GetReleaseVersion @@ -29,6 +30,12 @@ phases: ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ] steps: + # Need this for Python 2.7 + - task: UsePythonVersion@0 + displayName: 'Use Python 2.7.x' + inputs: + versionSpec: 2.7.x + - task: NodeTool@0 inputs: versionSpec: 8.9.3 diff --git a/script/vsts/platforms/linux.yml b/script/vsts/platforms/linux.yml index 51e7e5001..c62427771 100644 --- a/script/vsts/platforms/linux.yml +++ b/script/vsts/platforms/linux.yml @@ -1,10 +1,10 @@ -phases: -- phase: Linux +jobs: +- job: Linux dependsOn: GetReleaseVersion variables: ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ] - queue: - name: Hosted Ubuntu 1604 + pool: + vmImage: ubuntu-16.04 timeoutInMinutes: 180 steps: diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml index e7443860e..1cf24fd32 100644 --- a/script/vsts/platforms/macos.yml +++ b/script/vsts/platforms/macos.yml @@ -1,12 +1,12 @@ -phases: -- phase: macOS +jobs: +- job: macOS dependsOn: GetReleaseVersion variables: ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ] IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ] IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ] - queue: - name: Hosted macOS Preview + pool: + vmImage: macos-10.13 timeoutInMinutes: 180 steps: diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml index aba06b2a3..3b323f859 100644 --- a/script/vsts/platforms/windows.yml +++ b/script/vsts/platforms/windows.yml @@ -1,12 +1,12 @@ -phases: -- phase: Windows +jobs: +- job: Windows dependsOn: GetReleaseVersion variables: ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ] IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ] IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ] - queue: - name: Hosted + pool: + vmImage: vs2017-win2016 timeoutInMinutes: 180 parallel: 2 matrix: