Skip to content
Permalink
Browse files
[Merge-Queue] Commit directly to GitHub
https://bugs.webkit.org/show_bug.cgi?id=241899
<rdar://93108587>

Reviewed by Aakash Jain.

* Tools/CISupport/ews-build/factories.py:
(CommitQueueFactory.__init__): Remove git-svn steps.
(MergeQueueFactoryBase.__init__): Ditto.
(MergeQueueFactory.__init__): Update pull-request before pushing commit to main.
(UnsafeMergeQueueFactory.__init__): Ditto.
* Tools/CISupport/ews-build/factories_unittest.py:
(TestExpectedBuildSteps):
* Tools/CISupport/ews-build/steps.py:
(PushCommitToWebKitRepo):
(PushCommitToWebKitRepo.__init__):
(PushCommitToWebKitRepo.start): Push commit to 'origin'.
(PushCommitToWebKitRepo.evaluateCommand): Remove git-svn, replace revision with hash.
Pull requests are updated before landing instead of after.
(PushCommitToWebKitRepo.hash_from_commit_text): Extract hash from git command.
(DetermineLandedIdentifier.evaluateCommand): Use hash instead of revision.
(DetermineLandedIdentifier.url_for_hash_details): Ditto.
(DetermineLandedIdentifier.identifier_for_hash): Ditto.
(DetermineLandedIdentifier.comment_text_for_bug): Use hash instead of revision, use
identifier as the default commit format.
(Canonicalize.run): Delete identifiers.json to ensure canonicalization is correct,
reset the commit and author time.
(PushCommitToWebKitRepo.svn_revision_from_commit_text): Deleted.
(DetermineLandedIdentifier.url_for_revision_details): Deleted.
(DetermineLandedIdentifier.identifier_for_revision): Deleted.
(AddAuthorToCommitMessage): Deleted.
(GitSvnFetch): Deleted.
(ResetGitSvn): Deleted.
(DetermineAuthor): Deleted.
* Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: https://commits.webkit.org/251782@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@295777 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
JonWBedard committed Jun 23, 2022
1 parent 4d36020 commit 6c074d1e52c555d43db5738caf6007c988b85ff3
Showing 4 changed files with 168 additions and 416 deletions.
@@ -24,15 +24,15 @@
from buildbot.process import factory
from buildbot.steps import trigger

from steps import (AddAuthorToCommitMessage, AddReviewerToCommitMessage, ApplyPatch, ApplyWatchList, Canonicalize, CommitPatch,
from steps import (AddReviewerToCommitMessage, ApplyPatch, ApplyWatchList, Canonicalize, CommitPatch,
CheckOutPullRequest, CheckOutSource, CheckOutSpecificRevision, CheckChangeRelevance,
CheckPatchStatusOnEWSQueues, CheckStyle, CleanGitRepo, CompileJSC, CompileWebKit, ConfigureBuild,
DetermineAuthor, DownloadBuiltProduct, ExtractBuiltProduct, FetchBranches, FindModifiedLayoutTests, GitSvnFetch,
InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses, PrintConfiguration, PushCommitToWebKitRepo,
DownloadBuiltProduct, ExtractBuiltProduct, FetchBranches, FindModifiedLayoutTests,
InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses, PrintConfiguration, PushCommitToWebKitRepo, PushPullRequestBranch,
RunAPITests, RunBindingsTests, RunBuildWebKitOrgUnitTests, RunBuildbotCheckConfigForBuildWebKit, RunBuildbotCheckConfigForEWS,
RunEWSUnitTests, RunResultsdbpyTests, RunJavaScriptCoreTests, RunWebKit1Tests, RunWebKitPerlTests, RunWebKitPyPython2Tests,
RunWebKitPyPython3Tests, RunWebKitTests, RunWebKitTestsRedTree, RunWebKitTestsInStressMode, RunWebKitTestsInStressGuardmallocMode,
SetBuildSummary, ShowIdentifier, TriggerCrashLogSubmission, UpdateWorkingDirectory,
SetBuildSummary, ShowIdentifier, TriggerCrashLogSubmission, UpdateWorkingDirectory, UpdatePullRequest,
ValidateCommitMessage, ValidateChange, ValidateCommitterAndReviewer, WaitForCrashCollection,
InstallBuiltProduct, ValidateSquashed)

@@ -294,16 +294,13 @@ def __init__(self, platform, configuration=None, architectures=None, additionalA
self.addStep(PrintConfiguration())
self.addStep(CleanGitRepo())
self.addStep(CheckOutSource())
self.addStep(GitSvnFetch()) # FIXME: Remove when migrating to pure git
self.addStep(FetchBranches())
self.addStep(ShowIdentifier())
self.addStep(UpdateWorkingDirectory())
self.addStep(CommitPatch())

self.addStep(ValidateSquashed())
self.addStep(AddReviewerToCommitMessage())
self.addStep(DetermineAuthor())
self.addStep(AddAuthorToCommitMessage())
self.addStep(ValidateCommitMessage())

self.addStep(KillOldProcesses())
@@ -328,15 +325,12 @@ def __init__(self, platform, configuration=None, architectures=None, additionalA
self.addStep(PrintConfiguration())
self.addStep(CleanGitRepo())
self.addStep(CheckOutSource())
self.addStep(GitSvnFetch()) # FIXME: Remove when migrating to pure git
self.addStep(FetchBranches())
self.addStep(ShowIdentifier())
self.addStep(UpdateWorkingDirectory())
self.addStep(CheckOutPullRequest())
self.addStep(ValidateSquashed())
self.addStep(AddReviewerToCommitMessage())
self.addStep(DetermineAuthor())
self.addStep(AddAuthorToCommitMessage())
self.addStep(ValidateCommitMessage())


@@ -350,6 +344,8 @@ def __init__(self, platform, **kwargs):

self.addStep(ValidateChange(verifyMergeQueue=True, verifyNoDraftForMergeQueue=True))
self.addStep(Canonicalize())
self.addStep(PushPullRequestBranch())
self.addStep(UpdatePullRequest())
self.addStep(PushCommitToWebKitRepo())
self.addStep(SetBuildSummary())

@@ -360,5 +356,7 @@ def __init__(self, platform, **kwargs):

self.addStep(ValidateChange(verifyMergeQueue=True, verifyNoDraftForMergeQueue=True))
self.addStep(Canonicalize())
self.addStep(PushPullRequestBranch())
self.addStep(UpdatePullRequest())
self.addStep(PushCommitToWebKitRepo())
self.addStep(SetBuildSummary())
@@ -604,15 +604,12 @@ class TestExpectedBuildSteps(unittest.TestCase):
'configuration',
'clean-up-git-repo',
'clean-and-update-working-directory',
'git-svn-fetch',
'fetch-branch-references',
'show-identifier',
'update-working-directory',
'commit-patch',
'validate-squashed',
'add-reviewer-to-commit-message',
'determine-author',
'add-author-to-commit-message',
'validate-commit-message',
'kill-old-processes',
'compile-webkit',
@@ -632,21 +629,20 @@ class TestExpectedBuildSteps(unittest.TestCase):
'configuration',
'clean-up-git-repo',
'clean-and-update-working-directory',
'git-svn-fetch',
'fetch-branch-references',
'show-identifier',
'update-working-directory',
'checkout-pull-request',
'validate-squashed',
'add-reviewer-to-commit-message',
'determine-author',
'add-author-to-commit-message',
'validate-commit-message',
'kill-old-processes',
'compile-webkit',
'kill-old-processes',
'validate-change',
'canonicalize-commit',
'push-pull-request-branch',
'update-pull-request',
'push-commit-to-webkit-repo',
'set-build-summary'
],
@@ -657,18 +653,17 @@ class TestExpectedBuildSteps(unittest.TestCase):
'configuration',
'clean-up-git-repo',
'clean-and-update-working-directory',
'git-svn-fetch',
'fetch-branch-references',
'show-identifier',
'update-working-directory',
'checkout-pull-request',
'validate-squashed',
'add-reviewer-to-commit-message',
'determine-author',
'add-author-to-commit-message',
'validate-commit-message',
'validate-change',
'canonicalize-commit',
'push-pull-request-branch',
'update-pull-request',
'push-commit-to-webkit-repo',
'set-build-summary'
],

0 comments on commit 6c074d1

Please sign in to comment.