Skip to content
Permalink
Browse files
[EWS] Rebase PRs on tip of branch (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=236389
<rdar://problem/88705147>

Reviewed by Aakash Jain.

* Tools/CISupport/ews-build/steps.py:
(CleanGitRepo.run): Squash `git rebase --abort` errors.
* CISupport/ews-build/steps_unittest.py:


Canonical link: https://commits.webkit.org/247229@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@289756 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
JonWBedard committed Feb 14, 2022
1 parent 9c6f33f commit a35b3383f1bd58e9f519e6af3da73cc41270eca8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
@@ -3903,7 +3903,7 @@ def run(self):
branch = self.getProperty('basename', self.default_branch)
self.commands = []
for command in [
['git', 'rebase', '--abort'],
['/bin/sh', '-c', 'git rebase --abort & true'],
['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
@@ -4567,7 +4567,7 @@ def test_success(self):
self.setProperty('buildername', 'Style-EWS')

self.expectRemoteCommands(
ExpectShell(command=['git', 'rebase', '--abort'], workdir='wkdir', timeout=300, logEnviron=False) + 0
ExpectShell(command=['/bin/sh', '-c', 'git rebase --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=''),
@@ -4588,7 +4588,7 @@ def test_success_master(self):
self.setProperty('buildername', 'Commit-Queue')

self.expectRemoteCommands(
ExpectShell(command=['git', 'rebase', '--abort'], workdir='wkdir', timeout=300, logEnviron=False) + 0
ExpectShell(command=['/bin/sh', '-c', 'git rebase --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=''),
@@ -4609,7 +4609,7 @@ def test_failure(self):
self.setProperty('buildername', 'Commit-Queue')

self.expectRemoteCommands(
ExpectShell(command=['git', 'rebase', '--abort'], workdir='wkdir', timeout=300, logEnviron=False) + 0
ExpectShell(command=['/bin/sh', '-c', 'git rebase --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=''),
@@ -4631,7 +4631,7 @@ def test_branch(self):
self.setProperty('basename', 'safari-612-branch')

self.expectRemoteCommands(
ExpectShell(command=['git', 'rebase', '--abort'], workdir='wkdir', timeout=300, logEnviron=False) + 0
ExpectShell(command=['/bin/sh', '-c', 'git rebase --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=''),
@@ -1,3 +1,15 @@
2022-02-14 Jonathan Bedard <jbedard@apple.com>

[EWS] Rebase PRs on tip of branch (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=236389
<rdar://problem/88705147>

Reviewed by Aakash Jain.

* CISupport/ews-build/steps.py:
(CleanGitRepo.run): Squash `git rebase --abort` errors.
* CISupport/ews-build/steps_unittest.py:

2022-02-14 Fujii Hironori <Hironori.Fujii@sony.com>

run-jsc-stress-tests reports "in `<module:URI>': uninitialized class variable @@schemes in URI (NameError)" with Ruby 3.1

0 comments on commit a35b338

Please sign in to comment.