Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (260701 => 260702)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-04-25 14:41:37 UTC (rev 260701)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2020-04-25 14:46:55 UTC (rev 260702)
@@ -1197,7 +1197,7 @@
name = 'jhbuild'
description = ['updating gtk dependencies']
descriptionDone = ['Updated gtk dependencies']
- command = ['perl', 'Tools/Scripts/update-webkitgtk-libs']
+ command = ['perl', 'Tools/Scripts/update-webkitgtk-libs', WithProperties('--%(configuration)s')]
haltOnFailure = True
def __init__(self, **kwargs):
@@ -1208,7 +1208,7 @@
name = 'jhbuild'
description = ['updating wpe dependencies']
descriptionDone = ['Updated wpe dependencies']
- command = ['perl', 'Tools/Scripts/update-webkitwpe-libs']
+ command = ['perl', 'Tools/Scripts/update-webkitwpe-libs', WithProperties('--%(configuration)s')]
haltOnFailure = True
def __init__(self, **kwargs):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (260701 => 260702)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-04-25 14:41:37 UTC (rev 260701)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2020-04-25 14:46:55 UTC (rev 260702)
@@ -874,11 +874,12 @@
def test_success(self):
self.setupStep(InstallGtkDependencies())
+ self.setProperty('configuration', 'release')
self.assertEqual(InstallGtkDependencies.haltOnFailure, True)
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['perl', 'Tools/Scripts/update-webkitgtk-libs'],
+ command=['perl', 'Tools/Scripts/update-webkitgtk-libs', '--release'],
)
+ 0,
)
@@ -887,11 +888,12 @@
def test_failure(self):
self.setupStep(InstallGtkDependencies())
+ self.setProperty('configuration', 'release')
self.assertEqual(InstallGtkDependencies.haltOnFailure, True)
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['perl', 'Tools/Scripts/update-webkitgtk-libs'],
+ command=['perl', 'Tools/Scripts/update-webkitgtk-libs', '--release'],
)
+ ExpectShell.log('stdio', stdout='Unexpected error.')
+ 2,
@@ -910,11 +912,12 @@
def test_success(self):
self.setupStep(InstallWpeDependencies())
+ self.setProperty('configuration', 'release')
self.assertEqual(InstallWpeDependencies.haltOnFailure, True)
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['perl', 'Tools/Scripts/update-webkitwpe-libs'],
+ command=['perl', 'Tools/Scripts/update-webkitwpe-libs', '--release'],
)
+ 0,
)
@@ -923,11 +926,12 @@
def test_failure(self):
self.setupStep(InstallWpeDependencies())
+ self.setProperty('configuration', 'release')
self.assertEqual(InstallWpeDependencies.haltOnFailure, True)
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['perl', 'Tools/Scripts/update-webkitwpe-libs'],
+ command=['perl', 'Tools/Scripts/update-webkitwpe-libs', '--release'],
)
+ ExpectShell.log('stdio', stdout='Unexpected error.')
+ 2,
Modified: trunk/Tools/ChangeLog (260701 => 260702)
--- trunk/Tools/ChangeLog 2020-04-25 14:41:37 UTC (rev 260701)
+++ trunk/Tools/ChangeLog 2020-04-25 14:46:55 UTC (rev 260702)
@@ -1,3 +1,16 @@
+2020-04-25 Diego Pino Garcia <dp...@igalia.com>
+
+ [Flatpak SDK][EWS] Install dependencies step needs configuration as argument
+ https://bugs.webkit.org/show_bug.cgi?id=210913
+
+ Follow-up on r260560. The same change is needed for EWS bots.
+
+ Reviewed by Philippe Normand.
+
+ * BuildSlaveSupport/ews-build/steps.py:
+ (InstallGtkDependencies): Pass 'configuration' value (Release, Debug).
+ (InstallWpeDependencies): Pass 'configuration' value (Release, Debug).
+
2020-04-24 Alex Christensen <achristen...@webkit.org>
REGRESSION(260485) Payment requests don't do anything
