Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (281585 => 281586)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2021-08-25 21:18:03 UTC (rev 281585)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2021-08-25 21:18:16 UTC (rev 281586)
@@ -1264,7 +1264,7 @@
self.log_observer = logobserver.BufferLogObserver()
self.addLogObserver('stdio', self.log_observer)
revision = self.getProperty('got_revision')
- self.setCommand(['python', 'Tools/Scripts/git-webkit', 'find', 'r{}'.format(revision)])
+ self.setCommand(['python3', 'Tools/Scripts/git-webkit', 'find', 'r{}'.format(revision)])
return shell.ShellCommand.start(self)
def evaluateCommand(self, cmd):
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (281585 => 281586)
--- trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-08-25 21:18:03 UTC (rev 281585)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2021-08-25 21:18:16 UTC (rev 281586)
@@ -513,7 +513,7 @@
ExpectShell(workdir='wkdir',
timeout=600,
logEnviron=False,
- command=['python', 'Tools/Scripts/git-webkit', 'find', 'r272692']) +
+ command=['python3', 'Tools/Scripts/git-webkit', 'find', 'r272692']) +
ExpectShell.log('stdio', stdout='Identifier: 233939@main') +
0,
)
@@ -529,7 +529,7 @@
ExpectShell(workdir='wkdir',
timeout=600,
logEnviron=False,
- command=['python', 'Tools/Scripts/git-webkit', 'find', 'r272692']) +
+ command=['python3', 'Tools/Scripts/git-webkit', 'find', 'r272692']) +
ExpectShell.log('stdio', stdout='Unexpected failure') +
2,
)
Modified: trunk/Tools/CISupport/ews-build/steps.py (281585 => 281586)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-08-25 21:18:03 UTC (rev 281585)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-08-25 21:18:16 UTC (rev 281586)
@@ -223,7 +223,7 @@
revision = self.getProperty('ews_revision', self.getProperty('got_revision'))
if not revision:
revision = 'HEAD'
- self.setCommand(['python', 'Tools/Scripts/git-webkit', 'find', revision])
+ self.setCommand(['python3', 'Tools/Scripts/git-webkit', 'find', revision])
return shell.ShellCommand.start(self)
def evaluateCommand(self, cmd):
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (281585 => 281586)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-08-25 21:18:03 UTC (rev 281585)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-08-25 21:18:16 UTC (rev 281586)
@@ -4349,7 +4349,7 @@
ExpectShell(workdir='wkdir',
timeout=300,
logEnviron=False,
- command=['python', 'Tools/Scripts/git-webkit', 'find', '51a6aec9f664']) +
+ command=['python3', 'Tools/Scripts/git-webkit', 'find', '51a6aec9f664']) +
ExpectShell.log('stdio', stdout='Identifier: 233175@main') +
0,
)
@@ -4364,7 +4364,7 @@
ExpectShell(workdir='wkdir',
timeout=300,
logEnviron=False,
- command=['python', 'Tools/Scripts/git-webkit', 'find', 'HEAD']) +
+ command=['python3', 'Tools/Scripts/git-webkit', 'find', 'HEAD']) +
ExpectShell.log('stdio', stdout='Unexpected failure') +
2,
)
Modified: trunk/Tools/ChangeLog (281585 => 281586)
--- trunk/Tools/ChangeLog 2021-08-25 21:18:03 UTC (rev 281585)
+++ trunk/Tools/ChangeLog 2021-08-25 21:18:16 UTC (rev 281586)
@@ -1,5 +1,22 @@
2021-08-25 Jonathan Bedard <jbed...@apple.com>
+ [git-webkit] Use Python 3 in CI
+ https://bugs.webkit.org/show_bug.cgi?id=229498
+ <rdar://problem/82342387>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/build-webkit-org/steps.py:
+ (ShowIdentifier.start): Invoke git-webkit with Python 3.
+ * CISupport/build-webkit-org/steps_unittest.py:
+ (TestShowIdentifier.test_success):
+ (TestShowIdentifier.test_failure):
+ * CISupport/ews-build/steps.py:
+ (ShowIdentifier.start): Invoke git-webkit with Python 3.
+ * CISupport/ews-build/steps_unittest.py:
+
+2021-08-25 Jonathan Bedard <jbed...@apple.com>
+
[resultsdbpy] Handle E configuration comparisons
https://bugs.webkit.org/show_bug.cgi?id=229477
<rdar://problem/82316775>