aboutsummaryrefslogtreecommitdiff
path: root/infra
diff options
context:
space:
mode:
authorJordan Bayles <jophba@chromium.org>2019-12-10 01:48:21 +0000
committerCommit Bot <commit-bot@chromium.org>2019-12-10 01:48:39 +0000
commit80731930b024e6e09c32a5528e9f10f23f9c81bb (patch)
treefe5fdb50d105859fdb2db568aa87ad4b96e2c92a /infra
parent1a5032f91662568ed3fec6da12e747838914cf58 (diff)
downloadopenscreen-80731930b024e6e09c32a5528e9f10f23f9c81bb.tar.gz
Revert "Upgrade Mac bot to 10.15, to auto-upgrade compiler/toolchain."
This reverts commit 1a5032f91662568ed3fec6da12e747838914cf58. Reason for revert: LUCI trybots only support 10.13, so unforunately this won't work as of this time. Original change's description: > Upgrade Mac bot to 10.15, to auto-upgrade compiler/toolchain. > > Bug: openscreen:86 > Change-Id: I6eaca1e376dedb509be3c3009b0c33cce322647e > Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1954824 > Reviewed-by: Jordan Bayles <jophba@chromium.org> > Commit-Queue: Jordan Bayles <jophba@chromium.org> TBR=miu@chromium.org,jophba@chromium.org Change-Id: I213a12dd4f1d93a5e7dd30138c3575a9c049daf4 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: openscreen:86 Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1959587 Reviewed-by: Jordan Bayles <jophba@chromium.org> Commit-Queue: Jordan Bayles <jophba@chromium.org>
Diffstat (limited to 'infra')
-rw-r--r--infra/config/global/cr-buildbucket.cfg18
1 files changed, 1 insertions, 17 deletions
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 1c1bce2f..0b35cbf4 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -74,23 +74,7 @@ builder_mixins {
builder_mixins {
name: "mac"
-
- # NOTE: The OS version here will determine which version of XCode is being
- # used, and thus determines the compiler/linker versions. Relevant links; so
- # you and I never have to spend hours finding this stuff all over again to fix
- # things like https://crbug.com/openscreen/86:
- #
- # 1. The recipe code that uses the "osx_sdk" recipe module:
- #
- # https://cs.chromium.org/chromium/build/scripts/slave/recipes
- # /openscreen.py?rcl=671f9f1c5f5bef81d0a39973aa8729cc83bb290e&l=74
- #
- # 2. The XCode version look-up table in the "osx_sdk" recipe module:
- #
- # https://cs.chromium.org/chromium/tools/depot_tools/recipes/recipe_modules
- # /osx_sdk/api.py?rcl=fe18a43d590a5eac0d58e7e555b024746ba290ad&l=26
- dimensions: "os:Mac-10.15"
-
+ dimensions: "os:Mac-10.13"
caches: {
# Cache for mac_toolchain tool and XCode.app used in recipes.
name: "osx_sdk"