encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEPS: Make everything gated on dawn_standalone 

And standardizes dawn_standalone to be the first condition.

Bug: tint:261
Change-Id: I1bd74becd03776b1d7cdd74a4972378b7d951057
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/43880
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2021-03-04 17:37:55 +00:00 committed by Commit Bot service account
parent a736d96ffb
commit 2015b2f169
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DEPS
View File

@ -32,7 +32,7 @@ deps = {
'version': 'M56jPzDv1620Rnm__jTMYS62Zi8rxHVq7yw0qeBFEgkC', 'version': 'M56jPzDv1620Rnm__jTMYS62Zi8rxHVq7yw0qeBFEgkC',
} }
], ],
'condition': 'checkout_mac or checkout_ios', 'condition': 'dawn_standalone and (checkout_mac or checkout_ios)',
'dep_type': 'cipd', 'dep_type': 'cipd',
}, },
@ -110,14 +110,14 @@ hooks = [
{ {
'name': 'sysroot_x86', 'name': 'sysroot_x86',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_linux and ((checkout_x86 or checkout_x64) and dawn_standalone)', 'condition': 'dawn_standalone and checkout_linux and (checkout_x86 or checkout_x64)',
'action': ['python', 'build/linux/sysroot_scripts/install-sysroot.py', 'action': ['python', 'build/linux/sysroot_scripts/install-sysroot.py',
'--arch=x86'], '--arch=x86'],
}, },
{ {
'name': 'sysroot_x64', 'name': 'sysroot_x64',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_linux and (checkout_x64 and dawn_standalone)', 'condition': 'dawn_standalone and checkout_linux and checkout_x64',
'action': ['python', 'build/linux/sysroot_scripts/install-sysroot.py', 'action': ['python', 'build/linux/sysroot_scripts/install-sysroot.py',
'--arch=x64'], '--arch=x64'],
}, },
@ -126,14 +126,14 @@ hooks = [
# is more consistent (only changes when rolling build/) and is cached. # is more consistent (only changes when rolling build/) and is cached.
'name': 'mac_toolchain', 'name': 'mac_toolchain',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_mac', 'condition': 'dawn_standalone and checkout_mac',
'action': ['python', 'build/mac_toolchain.py'], 'action': ['python', 'build/mac_toolchain.py'],
}, },
{ {
# Update the Windows toolchain if necessary. Must run before 'clang' below. # Update the Windows toolchain if necessary. Must run before 'clang' below.
'name': 'win_toolchain', 'name': 'win_toolchain',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_win and dawn_standalone', 'condition': 'dawn_standalone and checkout_win',
'action': ['python', 'build/vs_toolchain.py', 'update', '--force'], 'action': ['python', 'build/vs_toolchain.py', 'update', '--force'],
}, },
{ {
@ -147,7 +147,7 @@ hooks = [
# Pull rc binaries using checked-in hashes. # Pull rc binaries using checked-in hashes.
'name': 'rc_win', 'name': 'rc_win',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_win and (host_os == "win" and dawn_standalone)', 'condition': 'dawn_standalone and checkout_win and host_os == "win"',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--no_auth', '--no_auth',
@ -159,7 +159,7 @@ hooks = [
{ {
'name': 'clang_format_win', 'name': 'clang_format_win',
'pattern': '.', 'pattern': '.',
'condition': 'host_os == "win"', 'condition': 'dawn_standalone and host_os == "win"',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--no_auth', '--no_auth',
@ -170,7 +170,7 @@ hooks = [
{ {
'name': 'clang_format_mac', 'name': 'clang_format_mac',
'pattern': '.', 'pattern': '.',
'condition': 'host_os == "mac"', 'condition': 'dawn_standalone and host_os == "mac"',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--no_auth', '--no_auth',
@ -181,7 +181,7 @@ hooks = [
{ {
'name': 'clang_format_linux', 'name': 'clang_format_linux',
'pattern': '.', 'pattern': '.',
'condition': 'host_os == "linux"', 'condition': 'dawn_standalone and host_os == "linux"',
'action': [ 'download_from_google_storage', 'action': [ 'download_from_google_storage',
'--no_resume', '--no_resume',
'--no_auth', '--no_auth',