Modified: trunk/Tools/CISupport/ews-build/steps.py (292543 => 292544)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-04-07 17:22:10 UTC (rev 292543)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-04-07 17:22:33 UTC (rev 292544)
@@ -4854,7 +4854,7 @@
def start(self, BufferLogObserverClass=logobserver.BufferLogObserver):
remote = self.getProperty('github.head.repo.full_name').split('/')[0]
head_ref = self.getProperty('github.head.ref')
- self.command = ['git', 'push', remote, head_ref, '-f']
+ self.command = ['git', 'push', '-f', remote, f'HEAD:{head_ref}']
username, access_token = GitHub.credentials()
self.workerEnvironment['GIT_USER'] = username
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (292543 => 292544)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-04-07 17:22:10 UTC (rev 292543)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2022-04-07 17:22:33 UTC (rev 292544)
@@ -6211,7 +6211,7 @@
logEnviron=False,
timeout=300,
env=dict(GIT_USER='webkit-commit-queue', GIT_PASSWORD='password'),
- command=['git', 'push', 'Contributor', 'eng/pull-request-branch', '-f'])
+ command=['git', 'push', '-f', 'Contributor', 'HEAD:eng/pull-request-branch'])
+ 0
+ ExpectShell.log('stdio', stdout='To https://github.com/Contributor/WebKit.git\n37b7da95723b...9e2cb83b07b6 eng/pull-request-branch -> eng/pull-request-branch (forced update)\n'),
)
@@ -6230,7 +6230,7 @@
logEnviron=False,
timeout=300,
env=dict(GIT_USER='webkit-commit-queue', GIT_PASSWORD='password'),
- command=['git', 'push', 'Contributor', 'eng/pull-request-branch', '-f'])
+ command=['git', 'push', '-f', 'Contributor', 'HEAD:eng/pull-request-branch'])
+ 1
+ ExpectShell.log('stdio', stdout="fatal: could not read Username for 'https://github.com': Device not configured\n"),
)
Modified: trunk/Tools/ChangeLog (292543 => 292544)
--- trunk/Tools/ChangeLog 2022-04-07 17:22:10 UTC (rev 292543)
+++ trunk/Tools/ChangeLog 2022-04-07 17:22:33 UTC (rev 292544)
@@ -1,3 +1,15 @@
+2022-04-07 Jonathan Bedard <jbed...@apple.com>
+
+ [Merge-Queue] Update pull-request with landed content (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=238554
+ <rdar://problem/91047260>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/ews-build/steps.py:
+ (PushPullRequestBranch.start): Push canonicalized HEAD to remote branch.
+ * CISupport/ews-build/steps_unittest.py:
+
2022-04-07 Youenn Fablet <you...@apple.com>
Use the same callback mechanism for ServiceWorker openWindow and navigate in UIProcess
