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

Enable merge queues #10515

Merged
merged 19 commits into from
Apr 6, 2023
Merged

Enable merge queues #10515

merged 19 commits into from
Apr 6, 2023

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Apr 5, 2023 •
edited by github-actions bot

This change is marked as an internal change (Task), so will not be included in the changelog.

@t3chguy t3chguy added the T-Task Refactoring, enabling or disabling functionality, other engineering tasks label Apr 5, 2023
@t3chguy t3chguy closed this Apr 5, 2023
@t3chguy t3chguy reopened this Apr 5, 2023
@t3chguy t3chguy marked this pull request as ready for review April 5, 2023 10:14
@t3chguy t3chguy requested a review from a team as a code owner April 5, 2023 10:14
@t3chguy
Copy link
Member Author

t3chguy commented Apr 5, 2023 •
edited

Note to self, enable merge queue branch protection before landing this

@t3chguy t3chguy mentioned this pull request Apr 5, 2023
Merged
@t3chguy t3chguy self-assigned this Apr 5, 2023
t3chguy
t3chguy commented Apr 5, 2023
View reviewed changes
.github/workflows/tests.yml
uses: actions/upload-artifact@v3
with:
name: coverage
path: |
coverage
!coverage/lcov-report

skip_sonar:
name: Skip SonarCloud on merge_queue
if: github.event_name == 'merge_group' || inputs.disable_coverage == 'true'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sadly can't reuse ENABLE_COVERAGE here as env isn't available to job.<name>.if

@t3chguy t3chguy added this pull request to the merge queue Apr 5, 2023
@t3chguy t3chguy removed this pull request from the merge queue due to a manual request Apr 5, 2023
@t3chguy t3chguy enabled auto-merge April 5, 2023 13:03
@t3chguy t3chguy added this pull request to the merge queue Apr 5, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 5, 2023
@t3chguy t3chguy added this pull request to the merge queue Apr 5, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 5, 2023
@t3chguy t3chguy added this pull request to the merge queue Apr 5, 2023
@t3chguy t3chguy removed this pull request from the merge queue due to the queue being cleared Apr 5, 2023
@t3chguy t3chguy added this pull request to the merge queue Apr 5, 2023
@t3chguy t3chguy removed this pull request from the merge queue due to the queue being cleared Apr 5, 2023
@t3chguy t3chguy added this pull request to the merge queue Apr 5, 2023
@t3chguy t3chguy removed this pull request from the merge queue due to the queue being cleared Apr 5, 2023
@t3chguy
Iterate
f4e5f26
@t3chguy
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk
53abf48 
 into t3chguy/merge_queue

# Conflicts:
#	.github/workflows/cypress.yaml
@t3chguy t3chguy enabled auto-merge April 5, 2023 16:51
@t3chguy t3chguy closed this Apr 5, 2023
auto-merge was automatically disabled April 5, 2023 16:59

Pull request was closed

@t3chguy t3chguy reopened this Apr 5, 2023
@t3chguy t3chguy enabled auto-merge April 5, 2023 16:59
@t3chguy t3chguy mentioned this pull request Apr 5, 2023
Merged
3 tasks
@t3chguy t3chguy added this pull request to the merge queue Apr 5, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 5, 2023
@t3chguy t3chguy added this pull request to the merge queue Apr 6, 2023
Merged via the queue into develop with commit b730321 Apr 6, 2023
@t3chguy t3chguy deleted the t3chguy/merge_queue branch April 6, 2023 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andybalaam andybalaam andybalaam approved these changes

@kerryarchibald kerryarchibald Awaiting requested review from kerryarchibald kerryarchibald is a code owner automatically assigned from matrix-org/element-web-team

Assignees

@t3chguy t3chguy

Labels
T-Task Refactoring, enabling or disabling functionality, other engineering tasks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@t3chguy @andybalaam