From 2891b87844187afd9288ea62f041dd7e2eb97221 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Wed, 31 Jul 2019 09:57:04 -0400 Subject: [PATCH] Set mac_sdk_min=10.13 for CommandBuffer builds The default SDK version was changed in https://chromium-review.googlesource.com/c/chromium/src/+/1711106, but our bots don't have that version yet. This is causing failed rolls, e.g. https://skia-review.googlesource.com/c/skia/+/231071. The DEPS change was cherry-picked from https://skia-review.googlesource.com/c/skia/+/231071. Change-Id: Iddfa0c7cb8ef676bf6f6b2093c120afdd33513f7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/231097 Auto-Submit: Ben Wagner aka dogben Reviewed-by: Eric Boren Commit-Queue: Ben Wagner aka dogben --- DEPS | 2 +- infra/bots/recipe_modules/build/default.py | 1 + .../Build-Mac-Clang-x86_64-Debug-CommandBuffer.json | 2 ++ .../Build-Mac-Clang-x86_64-Debug-CommandBuffer.json | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 9b3f6e872c..6b4af4dcfe 100644 --- a/DEPS +++ b/DEPS @@ -35,7 +35,7 @@ deps = { "third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@47af7c547f8551bd25424e56354a2ae1e9062859", "../src": { - "url": "https://chromium.googlesource.com/chromium/src.git@5c3e9d87e1942b7e03c45516cca96354495771d3", + "url": "https://chromium.googlesource.com/chromium/src.git@f6d0e4f58cbd1ef8e875ed4768f645247069e2db", "condition": "checkout_chromium", }, } diff --git a/infra/bots/recipe_modules/build/default.py b/infra/bots/recipe_modules/build/default.py index 1e9a099dff..692f0657b9 100644 --- a/infra/bots/recipe_modules/build/default.py +++ b/infra/bots/recipe_modules/build/default.py @@ -20,6 +20,7 @@ def build_command_buffer(api, chrome_dir, skia_dir, out): args=[ '--chrome-dir', chrome_dir, '--output-dir', out, + '--extra-gn-args', 'mac_sdk_min="10.13"', '--no-sync', '--no-hooks', '--make-output-dir']) diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 283ae12ab2..3ca3d1f73b 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -43,6 +43,8 @@ "[START_DIR]/cache/work", "--output-dir", "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", + "--extra-gn-args", + "mac_sdk_min=\"10.13\"", "--no-sync", "--no-hooks", "--make-output-dir" diff --git a/infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index c79b03e839..d51c0c9c1e 100644 --- a/infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -171,6 +171,8 @@ "[START_DIR]/cache/work", "--output-dir", "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer/Debug", + "--extra-gn-args", + "mac_sdk_min=\"10.13\"", "--no-sync", "--no-hooks", "--make-output-dir"