Modified: trunk/Tools/CISupport/ews-build/steps.py (276099 => 276100)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-04-16 00:53:33 UTC (rev 276099)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-04-16 01:06:47 UTC (rev 276100)
@@ -3133,7 +3133,7 @@
logEnviron = False
# This somewhat quirky sequence of steps seems to clear up all the broken
# git situations we've gotten ourself into in the past.
- command_list = [['git', 'clean', '-f'], # Remove any left-over layout test results, added files, etc.
+ command_list = [['git', 'clean', '-f', '-d'], # Remove any left-over layout test results, added files, etc.
['git', 'fetch', 'origin'], # Avoid updating the working copy to a stale revision.
['git', 'checkout', 'origin/main', '-f'],
['git', 'branch', '-D', 'main'],
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (276099 => 276100)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-16 00:53:33 UTC (rev 276099)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-16 01:06:47 UTC (rev 276100)
@@ -3902,7 +3902,7 @@
self.setProperty('buildername', 'Commit-Queue')
self.expectRemoteCommands(
- ExpectShell(command=['git', 'clean', '-f'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+ ExpectShell(command=['git', 'clean', '-f', '-d'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+ ExpectShell.log('stdio', stdout=''),
ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+ ExpectShell.log('stdio', stdout=''),
@@ -3921,7 +3921,7 @@
self.setProperty('buildername', 'Commit-Queue')
self.expectRemoteCommands(
- ExpectShell(command=['git', 'clean', '-f'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+ ExpectShell(command=['git', 'clean', '-f', '-d'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+ ExpectShell.log('stdio', stdout=''),
ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=1200, logEnviron=False) + 128
+ ExpectShell.log('stdio', stdout='fatal: unable to access https://github.com/WebKit/WebKit.git/: Could not resolve host: github.com'),
Modified: trunk/Tools/ChangeLog (276099 => 276100)
--- trunk/Tools/ChangeLog 2021-04-16 00:53:33 UTC (rev 276099)
+++ trunk/Tools/ChangeLog 2021-04-16 01:06:47 UTC (rev 276100)
@@ -1,3 +1,14 @@
+2021-04-15 Aakash Jain <aakash_j...@apple.com>
+
+ Pass -d parameter to git clean in commit-queue
+ https://bugs.webkit.org/show_bug.cgi?id=224636
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/steps.py:
+ (CleanGitRepo):
+ * CISupport/ews-build/steps_unittest.py:
+
2021-04-15 Sam Sneddon <gsnedd...@apple.com>
scm_unittest.py fails at import-time on Python 2
