[autoroll] Fold SPIR-V Headers into SPIR-V Tools -> ANGLE roller
Bug: skia:8907
Change-Id: I97f3f754d5ca9c51c8b02a76bb0d25e06b06cf2b
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/220716
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Jamie Madill <jmadill@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/autoroll/config/spirv-headers-angle.json b/autoroll/config/spirv-headers-angle.json
deleted file mode 100644
index 3244ed7..0000000
--- a/autoroll/config/spirv-headers-angle.json
+++ /dev/null
@@ -1,47 +0,0 @@
-// See https://skia.googlesource.com/buildbot.git/+/master/autoroll/go/roller/config.go#130
-// for documentation of the autoroller config.
-{
- "childName": "SPIRV-Headers",
- "contacts": [
- "geofflang@chromium.org",
- "jmadill@chromium.org",
- "syoussefi@chromium.org",
- "ynovikov@chromium.org"
- ],
- "gerrit": {
- "url": "https://chromium-review.googlesource.com",
- "project": "angle/angle",
- "config": "angle"
- },
- "isInternal": false,
- "parentName": "ANGLE",
- "parentWaterfall": "https://ci.chromium.org/p/angle/g/ci/console",
- "rollerName": "spirv-headers-angle-autoroll",
- "serviceAccount": "angle-autoroll@skia-public.iam.gserviceaccount.com",
- "sheriff": [
- "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
- ],
- "sheriffBackup": [
- "ynovikov@chromium.org"
- ],
- "noCheckoutDEPSRepoManager": {
- "childBranch": "master",
- "childPath": "./third_party/spirv-headers/src",
- "childRepo": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git",
- "childRevLinkTmpl": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git/+/%s",
- "includeBugs": false,
- "includeLog": false,
- "parentBranch": "master",
- "parentRepo": "https://chromium.googlesource.com/angle/angle.git"
- },
- "kubernetes": {
- "cpu": "1",
- "memory": "2Gi",
- "disk": "2Gi",
- "readinessInitialDelaySeconds": "30",
- "readinessPeriodSeconds": "30",
- "readinessFailureThreshold": "10"
- },
- "maxRollFrequency": "6h",
- "timeWindow": "M-F 07:00-10:00"
-}
diff --git a/autoroll/config/spirv-tools-angle.json b/autoroll/config/spirv-tools-angle.json
index f6bb3d1..d4dd65c 100644
--- a/autoroll/config/spirv-tools-angle.json
+++ b/autoroll/config/spirv-tools-angle.json
@@ -32,7 +32,10 @@
"includeBugs": false,
"includeLog": false,
"parentBranch": "master",
- "parentRepo": "https://chromium.googlesource.com/angle/angle.git"
+ "parentRepo": "https://chromium.googlesource.com/angle/angle.git",
+ "transitiveDeps": {
+ "external/spirv-headers": "./third_party/spirv-headers/src"
+ }
},
"kubernetes": {
"cpu": "1",
