Title: [291112] trunk/Tools
- Revision
- 291112
- Author
- jbed...@apple.com
- Date
- 2022-03-10 08:31:57 -0800 (Thu, 10 Mar 2022)
Log Message
[EWS] Add DEFAULT_BRANCH variable
https://bugs.webkit.org/show_bug.cgi?id=237693
<rdar://problem/90067276>
Reviewed by Aakash Jain.
* Tools/CISupport/ews-build/steps.py:
(ShowIdentifier.evaluateCommand):
(CheckOutPullRequest.run):
(CleanGitRepo.__init__):
Canonical link: https://commits.webkit.org/248274@main
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (291111 => 291112)
--- trunk/Tools/CISupport/ews-build/steps.py 2022-03-10 16:25:13 UTC (rev 291111)
+++ trunk/Tools/CISupport/ews-build/steps.py 2022-03-10 16:31:57 UTC (rev 291112)
@@ -59,6 +59,7 @@
GITHUB_URL = 'https://github.com/'
GITHUB_PROJECTS = ['WebKit/WebKit']
HASH_LENGTH_TO_DISPLAY = 8
+DEFAULT_BRANCH = 'main'
class BufferLogHeaderObserver(logobserver.BufferLogObserver):
@@ -542,7 +543,7 @@
if match:
identifier = match.group(1)
if identifier:
- identifier = identifier.replace('master', 'main')
+ identifier = identifier.replace('master', DEFAULT_BRANCH)
self.setProperty('identifier', identifier)
ews_revision = self.getProperty('ews_revision')
if ews_revision:
@@ -699,7 +700,7 @@
remote = self.getProperty('github.head.repo.full_name', 'origin').split('/')[0]
project = self.getProperty('github.head.repo.full_name', self.getProperty('project'))
- pr_branch = self.getProperty('github.head.ref', 'main')
+ pr_branch = self.getProperty('github.head.ref', DEFAULT_BRANCH)
base_hash = self.getProperty('github.base.sha')
rebase_target_hash = self.getProperty('ews_revision') or self.getProperty('got_revision')
@@ -4101,7 +4102,7 @@
flunkOnFailure = False
logEnviron = False
- def __init__(self, default_branch='main', remote='origin', **kwargs):
+ def __init__(self, default_branch=DEFAULT_BRANCH, remote='origin', **kwargs):
super(CleanGitRepo, self).__init__(timeout=5 * 60, **kwargs)
self.default_branch = default_branch
self.git_remote = remote
Modified: trunk/Tools/ChangeLog (291111 => 291112)
--- trunk/Tools/ChangeLog 2022-03-10 16:25:13 UTC (rev 291111)
+++ trunk/Tools/ChangeLog 2022-03-10 16:31:57 UTC (rev 291112)
@@ -1,3 +1,16 @@
+2022-03-09 Jonathan Bedard <jbed...@apple.com>
+
+ [EWS] Add DEFAULT_BRANCH variable
+ https://bugs.webkit.org/show_bug.cgi?id=237693
+ <rdar://problem/90067276>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/ews-build/steps.py:
+ (ShowIdentifier.evaluateCommand):
+ (CheckOutPullRequest.run):
+ (CleanGitRepo.__init__):
+
2022-03-10 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][WPE] Add initial support for PDF documents using PDF.js
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
