[webkit-changes] [294403] trunk/Tools/CISupport/ews-build

Wed, 18 May 2022 10:28:22 -0700

Title: [294403] trunk/Tools/CISupport/ews-build
Revision
294403
Author
[email protected]
Date
2022-05-18 10:26:42 -0700 (Wed, 18 May 2022)

Log Message

[Commit-Queue] Forbid ChangeLog modification (Follow-up)
https://bugs.webkit.org/show_bug.cgi?id=240461
<rdar://93351783>

Reviewed by Alexey Proskuryakov.

* Tools/CISupport/ews-build/steps.py:
(CleanGitRepo.run): Abort any in progress `git am` commands.
* Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: https://commits.webkit.org/250697@main

Modified Paths

Diff

Modified: trunk/Tools/CISupport/ews-build/steps.py (294402 => 294403)


--- trunk/Tools/CISupport/ews-build/steps.py	2022-05-18 17:01:14 UTC (rev 294402)
+++ trunk/Tools/CISupport/ews-build/steps.py	2022-05-18 17:26:42 UTC (rev 294403)
@@ -4419,6 +4419,7 @@
         self.commands = []
         for command in [
             self.shell_command('git rebase --abort || {}'.format(self.shell_exit_0())),
+            self.shell_command('git am --abort || {}'.format(self.shell_exit_0())),
             ['git', 'clean', '-f', '-d'],  # Remove any left-over layout test results, added files, etc.
             ['git', 'fetch', self.git_remote],  # Avoid updating the working copy to a stale revision.
             ['git', 'checkout', '{}/{}'.format(self.git_remote, branch), '-f'],  # Checkout branch from specific remote

Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (294402 => 294403)


--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2022-05-18 17:01:14 UTC (rev 294402)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2022-05-18 17:26:42 UTC (rev 294403)
@@ -4805,6 +4805,8 @@
         self.expectRemoteCommands(
             ExpectShell(command=['/bin/sh', '-c', 'git rebase --abort || true'], workdir='wkdir', timeout=300, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
+            ExpectShell(command=['/bin/sh', '-c', 'git am --abort || true'], workdir='wkdir', timeout=300, logEnviron=False) + 0
+            + ExpectShell.log('stdio', stdout=''),
             ExpectShell(command=['git', 'clean', '-f', '-d'], workdir='wkdir', timeout=300, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
             ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=300, logEnviron=False) + 0
@@ -4831,6 +4833,8 @@
         self.expectRemoteCommands(
             ExpectShell(command=['sh', '-c', 'git rebase --abort || exit 0'], workdir='wkdir', timeout=300, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
+            ExpectShell(command=['sh', '-c', 'git am --abort || exit 0'], workdir='wkdir', timeout=300, logEnviron=False) + 0
+            + ExpectShell.log('stdio', stdout=''),
             ExpectShell(command=['git', 'clean', '-f', '-d'], workdir='wkdir', timeout=300, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
             ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=300, logEnviron=False) + 0
@@ -4856,6 +4860,8 @@
         self.expectRemoteCommands(
             ExpectShell(command=['/bin/sh', '-c', 'git rebase --abort || true'], workdir='wkdir', timeout=300, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
+            ExpectShell(command=['/bin/sh', '-c', 'git am --abort || true'], workdir='wkdir', timeout=300, logEnviron=False) + 0
+            + ExpectShell.log('stdio', stdout=''),
             ExpectShell(command=['git', 'clean', '-f', '-d'], workdir='wkdir', timeout=300, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
             ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=300, logEnviron=False) + 0
@@ -4881,6 +4887,8 @@
         self.expectRemoteCommands(
             ExpectShell(command=['/bin/sh', '-c', 'git rebase --abort || true'], workdir='wkdir', timeout=300, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
+            ExpectShell(command=['/bin/sh', '-c', 'git am --abort || true'], workdir='wkdir', timeout=300, logEnviron=False) + 0
+            + ExpectShell.log('stdio', stdout=''),
             ExpectShell(command=['git', 'clean', '-f', '-d'], workdir='wkdir', timeout=300, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
             ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=300, logEnviron=False) + 128
@@ -4907,6 +4915,8 @@
         self.expectRemoteCommands(
             ExpectShell(command=['/bin/sh', '-c', 'git rebase --abort || true'], workdir='wkdir', timeout=300, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
+            ExpectShell(command=['/bin/sh', '-c', 'git am --abort || true'], workdir='wkdir', timeout=300, logEnviron=False) + 0
+            + ExpectShell.log('stdio', stdout=''),
             ExpectShell(command=['git', 'clean', '-f', '-d'], workdir='wkdir', timeout=300, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
             ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=300, logEnviron=False) + 0

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to