Changeset 286629 in webkit

Timestamp:

Dec 7, 2021, 4:24:28 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[commits.webkit.org] Fallback to remote repository (Part 2)
​https://bugs.webkit.org/show_bug.cgi?id=233904
<rdar://problem/86131927>

Reviewed by Dewei Zhu.

• CISupport/ews-build/steps.py:

(PushCommitToWebKitRepo.evaluateCommand): Wait before querying commits.webkit.org

Location:

trunk/Tools

Files:

• CISupport/ews-build/steps.py (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/CISupport/ews-build/steps.py

@@ -3712 +3712 @@
         rc = shell.ShellCommand.evaluateCommand(self, cmd)
         if rc == SUCCESS:
+            time.sleep(60)  # It takes time for commits.webkit.org to digest commits
             log_text = self.log_observer.getStdout() + self.log_observer.getStderr()
             svn_revision = self.svn_revision_from_commit_text(log_text)
@@ -3743 +3744 @@
             response = requests.get(self.url_for_revision_details(revision), timeout=60)
             if response and response.status_code == 200:
-                return response.json().get('identifier', 'r{}'.format(revision))
+                return response.json().get('identifier', 'r{}'.format(revision)).replace('@trunk', '@main')
             else:
                 print('Non-200 status code received from {}: {}'.format(COMMITS_INFO_URL, response.status_code))

trunk/Tools/ChangeLog

@@ +1 @@
+2021-12-07  Jonathan Bedard  <jbedard@apple.com>
+
+        [commits.webkit.org] Fallback to remote repository (Part 2)
+        https://bugs.webkit.org/show_bug.cgi?id=233904
+        <rdar://problem/86131927>
+
+        Reviewed by Dewei Zhu.
+
+        * CISupport/ews-build/steps.py:
+        (PushCommitToWebKitRepo.evaluateCommand): Wait before querying commits.webkit.org
+
 2021-12-06  Jonathan Bedard  <jbedard@apple.com>