[webkit-changes] [292496] trunk/Tools

Wed, 06 Apr 2022 13:11:54 -0700

Title: [292496] trunk/Tools
Revision
292496
Author
jbed...@apple.com
Date
2022-04-06 13:10:52 -0700 (Wed, 06 Apr 2022)

Log Message

[Merge-Queue] Use rebase over merge when canonicalizing commit
https://bugs.webkit.org/show_bug.cgi?id=238877
<rdar://problem/91363334>

Reviewed by Ryan Haddad and Aakash Jain.

* Tools/CISupport/ews-build/steps.py:
(Canonicalize.run): Specify rebase workflow instead of merge workflow.
* Tools/CISupport/ews-build/steps_unittest.py:

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

Modified Paths

Diff

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


--- trunk/Tools/CISupport/ews-build/steps.py	2022-04-06 19:44:10 UTC (rev 292495)
+++ trunk/Tools/CISupport/ews-build/steps.py	2022-04-06 20:10:52 UTC (rev 292496)
@@ -4912,7 +4912,7 @@
         commands = []
         if self.rebase_enabled:
             commands = [
-                ['git', 'pull', 'origin', base_ref],
+                ['git', 'pull', 'origin', base_ref, '--rebase'],
                 ['git', 'branch', '-f', base_ref, head_ref],
                 ['git', 'checkout', base_ref],
             ]

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


--- trunk/Tools/CISupport/ews-build/steps_unittest.py	2022-04-06 19:44:10 UTC (rev 292495)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py	2022-04-06 20:10:52 UTC (rev 292496)
@@ -6115,7 +6115,7 @@
                 workdir='wkdir',
                 timeout=300,
                 logEnviron=False,
-                command=['git', 'pull', 'origin', 'main'],
+                command=['git', 'pull', 'origin', 'main', '--rebase'],
             ) + 0, ExpectShell(
                 workdir='wkdir',
                 timeout=300,
@@ -6164,7 +6164,7 @@
                 workdir='wkdir',
                 timeout=300,
                 logEnviron=False,
-                command=['git', 'pull', 'origin', 'main'],
+                command=['git', 'pull', 'origin', 'main', '--rebase'],
             ) + 0, ExpectShell(
                 workdir='wkdir',
                 timeout=300,

Modified: trunk/Tools/ChangeLog (292495 => 292496)


--- trunk/Tools/ChangeLog	2022-04-06 19:44:10 UTC (rev 292495)
+++ trunk/Tools/ChangeLog	2022-04-06 20:10:52 UTC (rev 292496)
@@ -1,3 +1,15 @@
+2022-04-06  Jonathan Bedard  <jbed...@apple.com>
+
+        [Merge-Queue] Use rebase over merge when canonicalizing commit
+        https://bugs.webkit.org/show_bug.cgi?id=238877
+        <rdar://problem/91363334>
+
+        Reviewed by Ryan Haddad and Aakash Jain.
+
+        * CISupport/ews-build/steps.py:
+        (Canonicalize.run): Specify rebase workflow instead of merge workflow.
+        * CISupport/ews-build/steps_unittest.py:
+
 2022-04-06  Lauro Moura  <lmo...@igalia.com>
 
         [Flatpak SDK] Avoid termination if gdbus is not installed after 249303@main

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

Reply via email to