Skip to content

Commit e30ddc1

Browse files
committed
ci: switch macOS builders to 10.15
1 parent eda1a7a commit e30ddc1

File tree

5 files changed

+4
-21
lines changed

5 files changed

+4
-21
lines changed

src/bootstrap/test.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1050,10 +1050,10 @@ impl Step for Compiletest {
10501050
cmd.arg("--docck-python").arg(builder.python());
10511051

10521052
if builder.config.build.ends_with("apple-darwin") {
1053-
// Force /usr/bin/python on macOS for LLDB tests because we're loading the
1053+
// Force /usr/bin/python3 on macOS for LLDB tests because we're loading the
10541054
// LLDB plugin's compiled module which only works with the system python
10551055
// (namely not Homebrew-installed python)
1056-
cmd.arg("--lldb-python").arg("/usr/bin/python");
1056+
cmd.arg("--lldb-python").arg("/usr/bin/python3");
10571057
} else {
10581058
cmd.arg("--lldb-python").arg(builder.python());
10591059
}

src/ci/azure-pipelines/auto.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- job: macOS
6464
timeoutInMinutes: 600
6565
pool:
66-
vmImage: macos-10.13
66+
vmImage: macos-10.15
6767
steps:
6868
- template: steps/run.yml
6969
strategy:

src/ci/azure-pipelines/steps/run.yml

-4
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ steps:
4848
displayName: Install clang
4949
condition: and(succeeded(), not(variables.SKIP_JOB))
5050

51-
- bash: src/ci/scripts/switch-xcode.sh
52-
displayName: Switch to Xcode 9.3
53-
condition: and(succeeded(), not(variables.SKIP_JOB))
54-
5551
- bash: src/ci/scripts/install-wix.sh
5652
displayName: Install wix
5753
condition: and(succeeded(), not(variables.SKIP_JOB))

src/ci/azure-pipelines/try.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# - job: macOS
2626
# timeoutInMinutes: 600
2727
# pool:
28-
# vmImage: macos-10.13
28+
# vmImage: macos-10.15
2929
# steps:
3030
# - template: steps/run.yml
3131
# strategy:

src/ci/scripts/switch-xcode.sh

-13
This file was deleted.

0 commit comments

Comments
 (0)