[webkit-changes] [212429] trunk/Tools

Thu, 16 Feb 2017 04:15:54 -0800

Title: [212429] trunk/Tools
Revision
212429
Author
clo...@igalia.com
Date
2017-02-16 04:16:26 -0800 (Thu, 16 Feb 2017)

Log Message

[GTK] Add two new buildbots that build-only test on Debian stable and Ubuntu LTS
https://bugs.webkit.org/show_bug.cgi?id=168321

Reviewed by Michael Catanzaro.

The additionalArgument --default-cmake-features is used both to
skip the JHBuild (InstallGtkDependencies) build step and to build
with the default features from the CMake config.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(Factory.__init__):
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (212428 => 212429)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2017-02-16 12:08:53 UTC (rev 212428)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2017-02-16 12:16:26 UTC (rev 212429)
@@ -72,6 +72,8 @@
                     { "name": "gtk-linux-slave-7", "platform": "gtk" },
                     { "name": "gtk-linux-slave-8", "platform": "gtk" },
                     { "name": "gtk-linux-slave-9", "platform": "gtk" },
+                    { "name": "gtk-linux-slave-10", "platform": "gtk" },
+                    { "name": "gtk-linux-slave-11", "platform": "gtk" },
 
                     { "name": "jsconly-linux-szeged-slave-1", "platform": "jsc-only" },
                     { "name": "jsconly-linux-szeged-slave-2", "platform": "jsc-only" },
@@ -302,6 +304,18 @@
                       "slavenames": ["gtk-linux-slave-9"]
                     },
                     {
+                      "name": "GTK Linux 64-bit Release Debian Stable (Build)", "type": "Build", "builddir": "gtk-linux-64-release-debian",
+                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
+                      "additionalArguments": ["--default-cmake-features"],
+                      "slavenames": ["gtk-linux-slave-10"]
+                    },
+                    {
+                      "name": "GTK Linux 64-bit Release Ubuntu LTS (Build)", "type": "Build", "builddir": "gtk-linux-64-release-ubuntu",
+                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
+                      "additionalArguments": ["--default-cmake-features"],
+                      "slavenames": ["gtk-linux-slave-11"]
+                    },
+                    {
                       "name": "WinCairo 64-Bit Release", "type": "Build", "builddir": "win-cairo-release",
                       "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["wincairo-1", "wincairo-2"]

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (212428 => 212429)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg	2017-02-16 12:08:53 UTC (rev 212428)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg	2017-02-16 12:16:26 UTC (rev 212429)
@@ -773,7 +773,7 @@
         self.addStep(DeleteStaleBuildFiles())
         if platform == "win":
             self.addStep(InstallWin32Dependencies())
-        if platform == "gtk":
+        if platform == "gtk" and additionalArguments != ["--default-cmake-features"]:
             self.addStep(InstallGtkDependencies())

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (212428 => 212429)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py	2017-02-16 12:08:53 UTC (rev 212428)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py	2017-02-16 12:16:26 UTC (rev 212429)
@@ -417,6 +417,8 @@
     'GTK Linux 64-bit Release (Perf)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'perf-test', 'benchmark-test'],
     'GTK Linux 64-bit Release (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'jscore-test', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
     'GTK Linux 64-bit Release Wayland (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'download-built-product', 'extract-built-product', 'jscore-test', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
+    'GTK Linux 64-bit Release Ubuntu LTS (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
+    'GTK Linux 64-bit Release Debian Stable (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
     'GTK Linux ARM Release' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'jscore-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'API tests'],
 
     'WinCairo 64-Bit Release' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],

Modified: trunk/Tools/ChangeLog (212428 => 212429)


--- trunk/Tools/ChangeLog	2017-02-16 12:08:53 UTC (rev 212428)
+++ trunk/Tools/ChangeLog	2017-02-16 12:16:26 UTC (rev 212429)
@@ -1,3 +1,19 @@
+2017-02-16  Carlos Alberto Lopez Perez  <clo...@igalia.com>
+
+        [GTK] Add two new buildbots that build-only test on Debian stable and Ubuntu LTS
+        https://bugs.webkit.org/show_bug.cgi?id=168321
+
+        Reviewed by Michael Catanzaro.
+
+        The additionalArgument --default-cmake-features is used both to
+        skip the JHBuild (InstallGtkDependencies) build step and to build
+        with the default features from the CMake config.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (Factory.__init__):
+        * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+
 2017-02-15  Lucas Forschler  <lforsch...@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=168386

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to