diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-02-19 18:12:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 18:12:07 +0100 |
| commit | 2f914bf3278fa855ec0efa79698b8a481ff81b68 (patch) | |
| tree | 5dbbab96a44a72a1c180d5a74d4b2579f4d19a32 /src/ci/azure-pipelines | |
| parent | 7710ae0e2653e0fa14ff9b7797ed29340e0284a8 (diff) | |
| parent | 79c166ef73df00eac96aaeadcb326c972c22068c (diff) | |
| download | rust-2f914bf3278fa855ec0efa79698b8a481ff81b68.tar.gz rust-2f914bf3278fa855ec0efa79698b8a481ff81b68.zip | |
Rollup merge of #68863 - pietroalbini:azure-macos-10.15, r=Mark-Simulacrum
ci: switch macOS builders to 10.15 Azure Pipelines is deprecating the macOS 10.13 image we're currently running, [and they plan to remove them](https://devblogs.microsoft.com/devops/removing-older-images-in-azure-pipelines-hosted-pools/) on March 23, 2020. This PR switches our macOS builders to macOS 10.15. r? @Mark-Simulacrum
Diffstat (limited to 'src/ci/azure-pipelines')
| -rw-r--r-- | src/ci/azure-pipelines/auto.yml | 2 | ||||
| -rw-r--r-- | src/ci/azure-pipelines/steps/run.yml | 4 | ||||
| -rw-r--r-- | src/ci/azure-pipelines/try.yml | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/ci/azure-pipelines/auto.yml b/src/ci/azure-pipelines/auto.yml index 79a49fc48be..74b7469ea27 100644 --- a/src/ci/azure-pipelines/auto.yml +++ b/src/ci/azure-pipelines/auto.yml @@ -63,7 +63,7 @@ jobs: - job: macOS timeoutInMinutes: 600 pool: - vmImage: macos-10.13 + vmImage: macos-10.15 steps: - template: steps/run.yml strategy: diff --git a/src/ci/azure-pipelines/steps/run.yml b/src/ci/azure-pipelines/steps/run.yml index c39f75aba89..ee9425aa1c5 100644 --- a/src/ci/azure-pipelines/steps/run.yml +++ b/src/ci/azure-pipelines/steps/run.yml @@ -51,10 +51,6 @@ steps: displayName: Install clang condition: and(succeeded(), not(variables.SKIP_JOB)) -- bash: src/ci/scripts/switch-xcode.sh - displayName: Switch to Xcode 9.3 - condition: and(succeeded(), not(variables.SKIP_JOB)) - - bash: src/ci/scripts/install-wix.sh displayName: Install wix condition: and(succeeded(), not(variables.SKIP_JOB)) diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml index b6177b2cc9b..f8ddf0eb46c 100644 --- a/src/ci/azure-pipelines/try.yml +++ b/src/ci/azure-pipelines/try.yml @@ -25,7 +25,7 @@ jobs: # - job: macOS # timeoutInMinutes: 600 # pool: -# vmImage: macos-10.13 +# vmImage: macos-10.15 # steps: # - template: steps/run.yml # strategy: |