Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merge-Queue] Use rebase over merge when canonicalizing commit #248

Closed
wants to merge 1 commit into from
Closed

[Merge-Queue] Use rebase over merge when canonicalizing commit #248

wants to merge 1 commit into from

Conversation

JonWBedard
Copy link
Member

@JonWBedard JonWBedard commented Apr 6, 2022 •
edited by webkit-early-warning-system

0474084e98944608d2639420de2177724bdc8698

[Merge-Queue] Use rebase over merge when canonicalizing commit
https://bugs.webkit.org/show_bug.cgi?id=238877
<rdar://problem/91363334 >

Reviewed by Ryan Haddad and Aakash Jain.

* Tools/CISupport/ews-build/steps.py:
(Canonicalize.run): Specify rebase workflow instead of merge workflow.
* Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: https://commits.webkit.org/249344@main

@JonWBedard JonWBedard self-assigned this Apr 6, 2022
@JonWBedard JonWBedard added Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases WebKit Nightly Build labels Apr 6, 2022
@JonWBedard JonWBedard requested a review from aj062 April 6, 2022 17:49
@JonWBedard
Copy link
Member Author

Example of this working:
https://ews-build.webkit-uat.org/#/builders/85/builds/163
Example of a failure before this:
https://ews-build.webkit-uat.org/#/builders/85/builds/161

@JonWBedard JonWBedard added the merge-queue Applied to send a pull request to merge-queue label Apr 6, 2022
@JonWBedard
[Merge-Queue] Use rebase over merge when canonicalizing commit
cd31cdf 
https://bugs.webkit.org/show_bug.cgi?id=238877
<rdar://problem/91363334>

Reviewed by Ryan Haddad and Aakash Jain.

* Tools/CISupport/ews-build/steps.py:
(Canonicalize.run): Specify rebase workflow instead of merge workflow.
* Tools/CISupport/ews-build/steps_unittest.py:
@webkit-early-warning-system webkit-early-warning-system force-pushed the eng/Merge-Queue-Use-rebase-over-merge-when-canonicalizing-commit branch from b8d56b3 to cd31cdf Compare April 6, 2022 20:10
@JonWBedard
Copy link
Member Author

Landed https://commits.webkit.org/249344@main (r292496)

@JonWBedard JonWBedard closed this Apr 6, 2022
@JonWBedard JonWBedard removed the merge-queue Applied to send a pull request to merge-queue label Apr 6, 2022
@turbomaster95 turbomaster95 mentioned this pull request May 28, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ryanhaddad ryanhaddad ryanhaddad approved these changes

@aj062 aj062 aj062 approved these changes

Assignees

@JonWBedard JonWBedard

Labels
Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
Milestone
No milestone
3 participants
@JonWBedard @ryanhaddad @aj062