aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--infra/bots/jobs.json4
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json70
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json56
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.py2
-rw-r--r--infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json (renamed from infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json)38
-rw-r--r--infra/bots/recipes/compile.py2
-rw-r--r--infra/bots/tasks.json73
7 files changed, 145 insertions, 100 deletions
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 34554c8682..c6a28f8d99 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -76,6 +76,7 @@
"Build-Mac-Clang-x86_64-Release-TSAN",
"Build-Win-Clang-arm64-Release-Android",
"Build-Win-Clang-x86-Debug",
+ "Build-Win-Clang-x86-Debug-Exceptions",
"Build-Win-Clang-x86-Release",
"Build-Win-Clang-x86_64-Debug",
"Build-Win-Clang-x86_64-Debug-ANGLE",
@@ -86,7 +87,6 @@
"Build-Win-Clang-x86_64-Release-UBSAN",
"Build-Win-Clang-x86_64-Release-Vulkan",
"Build-Win-MSVC-x86-Debug",
- "Build-Win-MSVC-x86-Debug-Exceptions",
"Build-Win-MSVC-x86-Release",
"Build-Win-MSVC-x86_64-Debug",
"Build-Win-MSVC-x86_64-Debug-Vulkan",
@@ -482,8 +482,8 @@
"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-Vulkan",
"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All",
"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE",
- "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-NativeFonts",
+ "Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan",
"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All",
"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE",
"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json
new file mode 100644
index 0000000000..822c2738c3
--- /dev/null
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-Clang-x86-Debug-Exceptions.json
@@ -0,0 +1,70 @@
+[
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[CUSTOM_C:\\_B_WORK]/skia/infra/bots/assets/clang_win/VERSION",
+ "/path/to/tmp/"
+ ],
+ "infra_step": true,
+ "name": "Get clang_win VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn"
+ ],
+ "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
+ "env": {
+ "BUILDTYPE": "Debug",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions"
+ },
+ "infra_step": true,
+ "name": "fetch-gn"
+ },
+ {
+ "cmd": [
+ "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe",
+ "gen",
+ "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug",
+ "--args=cc=\"clang\" clang_win=\"[START_DIR]/clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
+ ],
+ "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
+ "env": {
+ "BUILDTYPE": "Debug",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions"
+ },
+ "name": "gn gen"
+ },
+ {
+ "cmd": [
+ "ninja.exe",
+ "-k",
+ "0",
+ "-C",
+ "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions/Debug"
+ ],
+ "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
+ "env": {
+ "BUILDTYPE": "Debug",
+ "CHROME_HEADLESS": "1",
+ "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-Clang-x86-Debug-Exceptions"
+ },
+ "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.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
deleted file mode 100644
index bf08caa1a5..0000000000
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "[CUSTOM_C:\\_B_WORK]/skia/bin/fetch-gn"
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions"
- },
- "infra_step": true,
- "name": "fetch-gn"
- },
- {
- "cmd": [
- "[CUSTOM_C:\\_B_WORK]/skia/bin/gn.exe",
- "gen",
- "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug",
- "--args=extra_cflags=[\"/EHsc\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]/t/depot_tools/win_toolchain/vs_files/a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions"
- },
- "name": "gn gen"
- },
- {
- "cmd": [
- "ninja.exe",
- "-k",
- "0",
- "-C",
- "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions/Debug"
- ],
- "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
- "env": {
- "BUILDTYPE": "Debug",
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug-Exceptions"
- },
- "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 4ebd98a9a2..b5ac5cdc53 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.py
+++ b/infra/bots/recipe_modules/flavor/examples/full.py
@@ -81,10 +81,10 @@ TEST_BUILDERS = [
'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
'Build-Mac-Clang-x86_64-Debug-Metal',
'Build-Win-Clang-arm64-Release-Android',
+ 'Build-Win-Clang-x86-Debug-Exceptions',
'Build-Win-Clang-x86_64-Debug-GDI',
'Build-Win-Clang-x86_64-Release',
'Build-Win-Clang-x86_64-Release-Vulkan',
- 'Build-Win-MSVC-x86-Debug-Exceptions',
'Housekeeper-PerCommit-CheckGeneratedFiles',
'Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android',
'Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android',
diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json
index 1d8d3e1c3c..a883eba66e 100644
--- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json
+++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug-Exceptions.json
@@ -97,14 +97,34 @@
"cmd": [
"python",
"-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\assets\\clang_win\\VERSION",
+ "/path/to/tmp/"
+ ],
+ "env": {
+ "CC": "/usr/bin/clang",
+ "CXX": "/usr/bin/clang++"
+ },
+ "infra_step": true,
+ "name": "Get clang_win VERSION"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[CUSTOM_C:\\_B_WORK]\\skia\\bin\\fetch-gn"
],
"cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
"env": {
"BUILDTYPE": "Debug",
+ "CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
+ "CXX": "/usr/bin/clang++",
"PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions"
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions"
},
"infra_step": true,
"name": "fetch-gn"
@@ -113,15 +133,17 @@
"cmd": [
"[CUSTOM_C:\\_B_WORK]\\skia\\bin\\gn.exe",
"gen",
- "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions\\Debug",
- "--args=extra_cflags=[\"/EHsc\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
+ "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug",
+ "--args=cc=\"clang\" clang_win=\"[START_DIR]\\clang_win\" cxx=\"clang++\" extra_cflags=[\"-O1\", \"/EHsc\", \"-DDUMMY_clang_win_version=42\"] target_cpu=\"x86\" win_sdk=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/win_sdk\" win_vc=\"[START_DIR]\\t\\depot_tools\\win_toolchain\\vs_files\\a9e1098bba66d2acccc377d5ee81265910f29272/VC\""
],
"cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
"env": {
"BUILDTYPE": "Debug",
+ "CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
+ "CXX": "/usr/bin/clang++",
"PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions"
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions"
},
"name": "gn gen"
},
@@ -131,14 +153,16 @@
"-k",
"0",
"-C",
- "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions\\Debug"
+ "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug"
],
"cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
"env": {
"BUILDTYPE": "Debug",
+ "CC": "/usr/bin/clang",
"CHROME_HEADLESS": "1",
+ "CXX": "/usr/bin/clang++",
"PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions"
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions"
},
"name": "ninja"
},
@@ -147,7 +171,7 @@
"python",
"-u",
"import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['bookmaker', 'dm', 'dm.exe', 'dm.app', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skiaserve', 'lib/*.so', 'run_testlab', 'skqp-universal-debug.apk', 'whitelist_devices.json']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
- "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Exceptions\\Debug",
+ "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-Clang-x86-Debug-Exceptions\\Debug",
"[CUSTOM_[SWARM_OUT_DIR]]\\out\\Debug"
],
"infra_step": true,
diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py
index 1ad4d7f12a..114db7259e 100644
--- a/infra/bots/recipes/compile.py
+++ b/infra/bots/recipes/compile.py
@@ -109,10 +109,10 @@ TEST_BUILDERS = [
'Build-Mac-Clang-x86_64-Debug-CommandBuffer',
'Build-Mac-Clang-x86_64-Release',
'Build-Win-Clang-arm64-Release-Android',
+ 'Build-Win-Clang-x86-Debug-Exceptions',
'Build-Win-Clang-x86_64-Release-Vulkan',
'Build-Win-MSVC-x86-Debug',
'Build-Win-MSVC-x86-Debug-ANGLE',
- 'Build-Win-MSVC-x86-Debug-Exceptions',
'Build-Win-MSVC-x86-Release-GDI',
]
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 17fa3188df..4bfee6d46b 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -467,6 +467,12 @@
"Build-Win-Clang-x86-Debug"
]
},
+ "Build-Win-Clang-x86-Debug-Exceptions": {
+ "priority": 0.8,
+ "tasks": [
+ "Build-Win-Clang-x86-Debug-Exceptions"
+ ]
+ },
"Build-Win-Clang-x86-Release": {
"priority": 0.8,
"tasks": [
@@ -527,12 +533,6 @@
"Build-Win-MSVC-x86-Debug"
]
},
- "Build-Win-MSVC-x86-Debug-Exceptions": {
- "priority": 0.8,
- "tasks": [
- "Build-Win-MSVC-x86-Debug-Exceptions"
- ]
- },
"Build-Win-MSVC-x86-Release": {
"priority": 0.8,
"tasks": [
@@ -5470,6 +5470,40 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
+ "Build-Win-Clang-x86-Debug-Exceptions": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/clang_win",
+ "path": "clang_win",
+ "version": "version:5"
+ }
+ ],
+ "dependencies": [
+ "Housekeeper-PerCommit-IsolateWinToolchain"
+ ],
+ "dimensions": [
+ "cpu:x86-64-Haswell_GCE",
+ "gpu:none",
+ "machine_type:n1-highcpu-64",
+ "os:Windows-2016Server-14393",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "compile",
+ "repository=<(REPO)",
+ "buildername=Build-Win-Clang-x86-Debug-Exceptions",
+ "swarm_out_dir=${ISOLATED_OUTDIR}",
+ "revision=<(REVISION)",
+ "patch_repo=<(PATCH_REPO)",
+ "patch_storage=<(PATCH_STORAGE)",
+ "patch_issue=<(ISSUE)",
+ "patch_set=<(PATCHSET)"
+ ],
+ "isolate": "compile_skia.isolate",
+ "priority": 0.8
+ },
"Build-Win-Clang-x86-Release": {
"cipd_packages": [
{
@@ -5805,33 +5839,6 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
- "Build-Win-MSVC-x86-Debug-Exceptions": {
- "dependencies": [
- "Housekeeper-PerCommit-IsolateWinToolchain"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "machine_type:n1-highcpu-64",
- "os:Windows-2016Server-14393",
- "pool:Skia"
- ],
- "extra_args": [
- "--workdir",
- "../../..",
- "compile",
- "repository=<(REPO)",
- "buildername=Build-Win-MSVC-x86-Debug-Exceptions",
- "swarm_out_dir=${ISOLATED_OUTDIR}",
- "revision=<(REVISION)",
- "patch_repo=<(PATCH_REPO)",
- "patch_storage=<(PATCH_STORAGE)",
- "patch_issue=<(ISSUE)",
- "patch_set=<(PATCHSET)"
- ],
- "isolate": "compile_skia.isolate",
- "priority": 0.8
- },
"Build-Win-MSVC-x86-Release": {
"dependencies": [
"Housekeeper-PerCommit-IsolateWinToolchain"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 15:29:46 +0000