aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots
diff options
context:
space:
mode:
Diffstat (limited to 'infra/bots')
-rw-r--r--infra/bots/assets/win_vulkan_sdk/VERSION2
-rw-r--r--infra/bots/assets/win_vulkan_sdk/create.py13
-rw-r--r--infra/bots/assets/win_vulkan_sdk/create_and_upload.py6
-rw-r--r--infra/bots/tasks.json2
4 files changed, 9 insertions, 14 deletions
diff --git a/infra/bots/assets/win_vulkan_sdk/VERSION b/infra/bots/assets/win_vulkan_sdk/VERSION
index d8263ee986..7f8f011eb7 100644
--- a/infra/bots/assets/win_vulkan_sdk/VERSION
+++ b/infra/bots/assets/win_vulkan_sdk/VERSION
@@ -1 +1 @@
-2 \ No newline at end of file
+7
diff --git a/infra/bots/assets/win_vulkan_sdk/create.py b/infra/bots/assets/win_vulkan_sdk/create.py
index 993345555c..0728f6d523 100644
--- a/infra/bots/assets/win_vulkan_sdk/create.py
+++ b/infra/bots/assets/win_vulkan_sdk/create.py
@@ -15,12 +15,14 @@ import sys
import os
-def create_asset(target_dir, sdk_path, runtime_path):
+def create_asset(target_dir, sdk_path):
"""Create the asset."""
+ # The bots only need Include from the SDK.
+ target_include_dir = os.path.join(target_dir, "Include")
+ sdk_include_dir = os.path.join(sdk_path, "Include")
if not os.path.isdir(target_dir):
os.makedirs(target_dir)
- shutil.copytree(sdk_path, target_dir)
- shutil.copyfile(runtime_path, os.path.join(target_dir, "vulkan-1.dll"))
+ shutil.copytree(sdk_include_dir, target_include_dir)
def main():
if sys.platform != 'win32':
@@ -29,11 +31,8 @@ def main():
parser = argparse.ArgumentParser()
parser.add_argument('--target_dir', '-t', required=True)
parser.add_argument('--sdk_path', '-s', required=True)
- parser.add_argument('--runtime_path', '-r',
- default=os.path.join("C:","System32","vulkan-1.dll"),
- required=True)
args = parser.parse_args()
- create_asset(args.target_dir, args.sdk_path, args.runtime_path)
+ create_asset(args.target_dir, args.sdk_path)
if __name__ == '__main__':
diff --git a/infra/bots/assets/win_vulkan_sdk/create_and_upload.py b/infra/bots/assets/win_vulkan_sdk/create_and_upload.py
index 38c6943381..69dbec994f 100644
--- a/infra/bots/assets/win_vulkan_sdk/create_and_upload.py
+++ b/infra/bots/assets/win_vulkan_sdk/create_and_upload.py
@@ -24,9 +24,6 @@ def main():
parser = argparse.ArgumentParser()
parser.add_argument('--gsutil')
parser.add_argument('--sdk_path', '-s', required=True)
- parser.add_argument('--runtime_path', '-r',
- default=os.path.join("C:","System32","vulkan-1.dll"),
- required=True)
args = parser.parse_args()
with utils.tmp_dir():
@@ -38,8 +35,7 @@ def main():
cwd = os.path.join(cwd, 'sdk')
cmd = ['python', create_script,
'-t', cwd,
- '--sdk_path', args.sdk_path,
- '--runtime_path', args.runtime_path]
+ '--sdk_path', args.sdk_path]
subprocess.check_call(cmd)
cmd = ['python', upload_script, '-t', cwd]
if args.gsutil:
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index a2b70eb575..249e9f387a 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -6403,7 +6403,7 @@
{
"name": "skia/bots/win_vulkan_sdk",
"path": "win_vulkan_sdk",
- "version": "version:2"
+ "version": "version:7"
}
],
"dimensions": [