Commit db529046 by Jamie Madill Committed by Commit Bot

Add new standalone compile configs.

These configs cover Win/Linux/Mac, debug/release, different compilers and x86/x64. We will then remove some of the other testers on the CQ once these are stable. Bug: chromium:833999 Change-Id: Ibcccd13b02a04e856cd7b051fe872593c2bcc047 Reviewed-on: https://chromium-review.googlesource.com/1040543Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent c6e62944
...@@ -49,10 +49,49 @@ builder_mixins { ...@@ -49,10 +49,49 @@ builder_mixins {
} }
builder_mixins { builder_mixins {
name: "win-msvc" name: "mac"
mixins: "win" dimensions: "os:Mac"
}
builder_mixins {
name: "clang"
recipe {
properties_j: "clang:true"
}
}
builder_mixins {
name: "no_clang"
recipe { recipe {
properties_j: "msvc:true" properties_j: "clang:false"
}
}
builder_mixins {
name: "rel"
recipe {
properties_j: "debug:false"
}
}
builder_mixins {
name: "dbg"
recipe {
properties_j: "debug:true"
}
}
builder_mixins {
name: "x86"
recipe {
properties: "target_cpu:x86"
}
}
builder_mixins {
name: "x64"
recipe {
properties: "target_cpu:x64"
} }
} }
...@@ -74,16 +113,105 @@ buckets { ...@@ -74,16 +113,105 @@ buckets {
} }
builders { builders {
name: "linux-clang-dbg"
mixins: "linux"
mixins: "clang"
mixins: "dbg"
}
builders {
name: "linux-clang-rel"
mixins: "linux"
mixins: "clang"
mixins: "rel"
}
builders {
name: "linux-gcc-dbg"
mixins: "linux"
mixins: "no_clang"
mixins: "dbg"
}
builders {
name: "linux-gcc-rel"
mixins: "linux"
mixins: "no_clang"
mixins: "rel"
}
builders {
name: "mac-dbg"
mixins: "mac"
mixins: "dbg"
}
builders {
name: "mac-rel"
mixins: "linux"
mixins: "rel"
}
builders {
name: "win-msvc-dbg"
mixins: "linux"
mixins: "no_clang"
mixins: "dbg"
}
builders {
name: "win-msvc-rel"
mixins: "linux"
mixins: "no_clang"
mixins: "rel"
}
builders {
name: "win-clang-x86-dbg"
mixins: "win"
mixins: "clang"
mixins: "dbg"
mixins: "x86"
}
builders {
name: "win-clang-x86-rel"
mixins: "win"
mixins: "clang"
mixins: "rel"
mixins: "x86"
}
builders {
name: "win-clang-x64-dbg"
mixins: "win"
mixins: "clang"
mixins: "dbg"
mixins: "x64"
}
builders {
name: "win-clang-x64-rel"
mixins: "win"
mixins: "clang"
mixins: "rel"
mixins: "x64"
}
# TODO(jmadill): Remove these when migrated. http://crbug.com/833999
builders {
name: "linux" name: "linux"
mixins: "linux" mixins: "linux"
} }
builders { builders {
name: "win" name: "win"
mixins: "win" mixins: "win"
mixins: "clang"
} }
builders { builders {
name: "win-msvc" name: "win-msvc"
mixins: "win-msvc" mixins: "win"
mixins: "no_clang"
} }
} }
} }
...@@ -109,6 +237,95 @@ buckets { ...@@ -109,6 +237,95 @@ buckets {
} }
builders { builders {
name: "linux-clang-dbg"
mixins: "linux"
mixins: "clang"
mixins: "dbg"
}
builders {
name: "linux-clang-rel"
mixins: "linux"
mixins: "clang"
mixins: "rel"
}
builders {
name: "linux-gcc-dbg"
mixins: "linux"
mixins: "no_clang"
mixins: "dbg"
}
builders {
name: "linux-gcc-rel"
mixins: "linux"
mixins: "no_clang"
mixins: "rel"
}
builders {
name: "mac-dbg"
mixins: "mac"
mixins: "dbg"
}
builders {
name: "mac-rel"
mixins: "linux"
mixins: "rel"
}
builders {
name: "win-msvc-x86-dbg"
mixins: "linux"
mixins: "no_clang"
mixins: "dbg"
mixins: "x86"
}
builders {
name: "win-msvc-x86-rel"
mixins: "linux"
mixins: "no_clang"
mixins: "rel"
mixins: "x86"
}
builders {
name: "win-clang-x86-dbg"
mixins: "win"
mixins: "clang"
mixins: "dbg"
mixins: "x86"
}
builders {
name: "win-clang-x86-rel"
mixins: "win"
mixins: "clang"
mixins: "rel"
mixins: "x86"
}
builders {
name: "win-clang-x64-dbg"
mixins: "win"
mixins: "clang"
mixins: "dbg"
mixins: "x64"
}
builders {
name: "win-clang-x64-rel"
mixins: "win"
mixins: "clang"
mixins: "rel"
mixins: "x64"
}
# TODO(jmadill): Remove these when migrated. http://crbug.com/833999
builders {
name: "linux" name: "linux"
mixins: "linux" mixins: "linux"
} }
......
...@@ -9,6 +9,68 @@ consoles { ...@@ -9,6 +9,68 @@ consoles {
manifest_name: "REVISION" manifest_name: "REVISION"
builders { builders {
name: "buildbucket/luci.angle.ci/linux-clang-dbg"
category: "linux|clang"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.ci/linux-clang-rel"
category: "linux|clang"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/linux-gcc-dbg"
category: "linux|gcc"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.ci/linux-gcc-rel"
category: "linux|gcc"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/mac-dbg"
category: "mac"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.ci/mac-rel"
category: "mac"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/win-clang-x86-dbg"
category: "mac|clang|x86"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.ci/win-clang-x86-rel"
category: "win|clang|x86"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/win-clang-x64-dbg"
category: "win|clang|x64"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.ci/win-clang-x64-rel"
category: "win|clang|x64"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.ci/win-msvc-x86-dbg"
category: "win|msvc|x86"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.ci/win-msvc-x86-rel"
category: "win|msvc|x86"
short_name: "rel"
}
# TODO(jmadill): Remove these when migrated. http://crbug.com/833999
builders {
name: "buildbucket/luci.angle.ci/linux" name: "buildbucket/luci.angle.ci/linux"
category: "linux" category: "linux"
short_name: "lnx" short_name: "lnx"
...@@ -33,6 +95,68 @@ consoles { ...@@ -33,6 +95,68 @@ consoles {
manifest_name: "PATCHED" manifest_name: "PATCHED"
builders { builders {
name: "buildbucket/luci.angle.try/linux-clang-dbg"
category: "linux|clang"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.try/linux-clang-rel"
category: "linux|clang"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.try/linux-gcc-dbg"
category: "linux|gcc"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.try/linux-gcc-rel"
category: "linux|gcc"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.try/mac-dbg"
category: "mac"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.try/mac-rel"
category: "mac"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.try/win-clang-x86-dbg"
category: "mac|clang|x86"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.try/win-clang-x86-rel"
category: "win|clang|x86"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.try/win-clang-x64-dbg"
category: "win|clang|x64"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.try/win-clang-x64-rel"
category: "win|clang|x64"
short_name: "rel"
}
builders {
name: "buildbucket/luci.angle.try/win-msvc-x86-dbg"
category: "win|msvc|x86"
short_name: "dbg"
}
builders {
name: "buildbucket/luci.angle.try/win-msvc-x86-rel"
category: "win|msvc|x86"
short_name: "rel"
}
# TODO(jmadill): Remove these when migrated. http://crbug.com/833999
builders {
name: "buildbucket/luci.angle.try/linux" name: "buildbucket/luci.angle.try/linux"
category: "linux" category: "linux"
short_name: "lnx" short_name: "lnx"
......
...@@ -25,12 +25,147 @@ trigger { ...@@ -25,12 +25,147 @@ trigger {
refs: "refs/heads/master" refs: "refs/heads/master"
} }
triggers: "linux-clang-dbg"
triggers: "linux-clang-rel"
triggers: "linux-gcc-dbg"
triggers: "linux-gcc-rel"
triggers: "mac-dbg"
triggers: "mac-rel"
triggers: "win-clang-x86-dbg"
triggers: "win-clang-x86-rel"
triggers: "win-clang-x64-dbg"
triggers: "win-clang-x64-rel"
triggers: "win-msvc-x86-dbg"
triggers: "win-msvc-x86-rel"
# TODO(jmadill): Remove these triggers when migrated. http://crbug.com/833999
triggers: "linux" triggers: "linux"
triggers: "win" triggers: "win"
triggers: "win-msvc" triggers: "win-msvc"
} }
job { job {
id: "linux-clang-dbg"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "linux-clang-dbg"
}
}
job {
id: "linux-clang-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "linux-clang-rel"
}
}
job {
id: "linux-gcc-dbg"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "linux-gcc-dbg"
}
}
job {
id: "linux-gcc-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "linux-gcc-rel"
}
}
job {
id: "mac-dbg"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "mac-dbg"
}
}
job {
id: "mac-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "mac-rel"
}
}
job {
id: "win-clang-x86-dbg"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "win-clang-x86-dbg"
}
}
job {
id: "win-clang-x86-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "win-clang-x86-rel"
}
}
job {
id: "win-clang-x64-dbg"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "win-clang-x64-dbg"
}
}
job {
id: "win-clang-x64-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "win-clang-x64-rel"
}
}
job {
id: "win-msvc-x86-dbg"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "win-msvc-x86-dbg"
}
}
job {
id: "win-msvc-x86-rel"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.angle.try"
builder: "win-msvc-x86-rel"
}
}
# TODO(jmadill): Remove these jobs when migrated. http://crbug.com/833999
job {
id: "linux" id: "linux"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment