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

Add Automerge Workflow with other smaller fixes #6892

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Add Automerge Workflow with other smaller fixes #6892

merged 2 commits into from
Apr 4, 2024

Conversation

peterzhuamazon
Copy link
Member

Description

Add Automerge Workflow with other smaller fixes

Issues Resolved

#6400

Checklist

  • By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and subject to the Developers Certificate of Origin.
    For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@peterzhuamazon
Add Automerge Workflow with other smaller fixes
178db82 
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon added enhancement New feature or request workflows labels Apr 4, 2024
@peterzhuamazon peterzhuamazon self-assigned this Apr 4, 2024
@peterzhuamazon
Copy link
Member Author

peterzhuamazon commented Apr 4, 2024 •
edited
Loading

Workflows:

  1. Backport: https://github.com/opensearch-project/documentation-website/actions/runs/8561913681/job/23464148784
  2. Automerge: https://github.com/opensearch-project/documentation-website/actions/runs/8561917496/job/23464159853?pr=6891

Sample PRs:

  1. Base PR: [TEST BACKPORT] TEST ONLY #6889
  2. Backport PR: [Backport testmain2] [TEST BACKPORT] TEST ONLY #6891

Steps:

  1. Add backport <branch> label at any time to the base PR.
  2. Merge base PR, backport PR created with label backport-automerge added, and workflow approve the PR with write access.
  3. Automerge workflow triggeres on the backport PR. It will verify that backport-automerge label present, approval present, opensearch-trigger-bot is the author of the backport PR before checking the status of the checks
  4. Note that checks will be ignored if branch protection rules does not label them as required, will add later, that is also why this PR include multiple other changes of other workflows to setup foundation.
  5. Once automerge check pass the PR will be automerged.
  6. The branch will be removed as well later.

On hold

If the label On hold is added right after it can prevent the automerge to happen.

Thanks.

@peterzhuamazon peterzhuamazon mentioned this pull request Apr 4, 2024
Closed
kolchfa-aws
kolchfa-aws approved these changes Apr 4, 2024
View reviewed changes
Copy link
Collaborator

@kolchfa-aws kolchfa-aws left a comment

Choose a reason for hiding this comment

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

LGTM

@peterzhuamazon
Add Automerge Workflow with other smaller fixes
3a2a819 
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
@peterzhuamazon peterzhuamazon merged commit 4333bc3 into main Apr 4, 2024
6 checks passed
@github-actions github-actions bot deleted the automerge-setups-2 branch April 4, 2024 22:28
@peterzhuamazon peterzhuamazon added the backport 2.13 PR: Backport label for 2.13 label Apr 4, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 4, 2024
@github-actions
Add Automerge Workflow with other smaller fixes (#6892)
408c27e 
* Add Automerge Workflow with other smaller fixes

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Add Automerge Workflow with other smaller fixes

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 4333bc3)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Apr 4, 2024
Merged
github-actions bot pushed a commit that referenced this pull request Apr 4, 2024
@opensearch-trigger-bot
Add Automerge Workflow with other smaller fixes (#6892) (#6893)
3765e9b
@peterzhuamazon peterzhuamazon mentioned this pull request Apr 5, 2024
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kolchfa-aws kolchfa-aws kolchfa-aws approved these changes

@hdhalter hdhalter Awaiting requested review from hdhalter

@Naarcha-AWS Naarcha-AWS Awaiting requested review from Naarcha-AWS Naarcha-AWS is a code owner

@vagimeli vagimeli Awaiting requested review from vagimeli

@AMoo-Miki AMoo-Miki Awaiting requested review from AMoo-Miki AMoo-Miki is a code owner

@natebower natebower Awaiting requested review from natebower natebower is a code owner

@dlvenable dlvenable Awaiting requested review from dlvenable dlvenable is a code owner

@stephen-crawford stephen-crawford Awaiting requested review from stephen-crawford

@epugh epugh Awaiting requested review from epugh epugh is a code owner

Assignees

@peterzhuamazon peterzhuamazon

Labels
backport 2.13 PR: Backport label for 2.13 enhancement New feature or request workflows
Projects
OpenSearch Engineering Effectiveness
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@peterzhuamazon @kolchfa-aws