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.

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

Improve breaking change logic for changelog verifier #15214

Merged
merged 1 commit into from
Aug 13, 2024

Conversation

jed326
Copy link
Collaborator

@jed326 jed326 commented Aug 12, 2024

Description

Improve breaking change logic for changelog verifier

Related Issues

Check List

  • Functionality includes testing.
    - [ ] API changes companion pull request created, if applicable.
    - [ ] Public documentation issue/PR created, if applicable.

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

@github-actions github-actions bot added Build Build Tasks/Gradle Plugin, groovy scripts, build tools, Javadoc enforcement. enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers labels Aug 12, 2024
Copy link
Contributor

❌ Gradle check result for 5b0d901: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@jed326 jed326 added the backport 2.x Backport to 2.x branch label Aug 12, 2024
Signed-off-by: Jay Deng <jayd0104@gmail.com>
@jed326 jed326 removed the >breaking Identifies a breaking change. label Aug 12, 2024
@jed326 jed326 marked this pull request as ready for review August 12, 2024 22:43
@jed326 jed326 requested a review from peternied as a code owner August 12, 2024 22:43
@jed326
Copy link
Collaborator Author

jed326 commented Aug 12, 2024

@andrross @sandeshkr419 could you help review? Thanks!

@peternied peternied merged commit 2defb76 into opensearch-project:main Aug 13, 2024
38 of 39 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-15214-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2defb76f8bb0d53714804963b5f155730a1825d8
# Push it to GitHub
git push --set-upstream origin backport/backport-15214-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-15214-to-2.x.

@peternied
Copy link
Member

@jed326 Can you look into what change wasn't backported and then retrigger this workflow once that's done?

@peternied peternied removed backport 2.x Backport to 2.x branch backport-failed labels Aug 13, 2024
@jed326
Copy link
Collaborator Author

jed326 commented Aug 13, 2024

Thanks @peternied, I realized that we probably don't want to backport this since changelog-3.0 doesn't exist on 2.x branch

wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build Build Tasks/Gradle Plugin, groovy scripts, build tools, Javadoc enforcement. enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers skip-changelog
Projects
None yet
2 participants