diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-01-03 16:15:33 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-04 14:46:59 +0000 |
| commit | e463d985587389970d6dbe87967c3cedefa9b8e4 (patch) | |
| tree | eef18a79fcb0bc545e79e49cf9370031fe4c6901 /infra/bots/recipe_modules/flavor | |
| parent | d12602aa1c4ed3066c4f3bd7e20d28d0eedd3436 (diff) | |
Switch to updated Mac bots.
Bug: skia:7408
Change-Id: I26273df7871e3ee01e227636421962fcc6251e7d
Reviewed-on: https://skia-review.googlesource.com/88080
Reviewed-by: Stephan Altmueller <stephana@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/flavor')
3 files changed, 61 insertions, 0 deletions
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json new file mode 100644 index 0000000000..a75f13c717 --- /dev/null +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -0,0 +1,56 @@ +[ + { + "cmd": [ + "python", + "-u", + "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + }, + "infra_step": true, + "name": "fetch-gn" + }, + { + "cmd": [ + "[CUSTOM_/_B_WORK]/skia/bin/gn", + "gen", + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug", + "--args=cc=\"clang\" cxx=\"clang++\" extra_cflags=[\"-O1\"] skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"Upstream Testing Provisioning Profile\" target_cpu=\"arm64\" target_os=\"ios\"" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + }, + "name": "gn gen" + }, + { + "cmd": [ + "ninja", + "-k", + "0", + "-C", + "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug" + ], + "cwd": "[CUSTOM_/_B_WORK]/skia", + "env": { + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-arm64-Debug-iOS" + }, + "name": "ninja" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py index 7597619b33..5f38a437a6 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.py +++ b/infra/bots/recipe_modules/flavor/examples/full.py @@ -73,6 +73,7 @@ TEST_BUILDERS = [ 'Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths', 'Build-Debian9-GCC-x86_64-Release-Shared', 'Build-Mac-Clang-arm64-Debug-Android_Vulkan', + 'Build-Mac-Clang-arm64-Debug-iOS', 'Build-Mac-Clang-x86_64-Debug-CommandBuffer', 'Build-Mac-Clang-x86_64-Debug-Metal', 'Build-Win-Clang-arm64-Release-Android', diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 6867d98498..63465517c9 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -157,6 +157,10 @@ with open(sys.argv[1], 'w') as f: args['skia_vulkan_sdk'] = '"%s"' % win_vulkan_sdk if 'Metal' in extra_tokens: args['skia_use_metal'] = 'true' + if 'iOS' in extra_tokens: + # Bots use Chromium signing cert. + args['skia_ios_identity'] = '".*GS9WA.*"' + args['skia_ios_profile'] = '"Upstream Testing Provisioning Profile"' if 'CheckGeneratedFiles' in extra_tokens: args['skia_compile_processors'] = 'true' if compiler == 'Clang' and 'Win' in os: |