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

Staging Version increment automation #239

Merged
merged 4 commits into from
Aug 1, 2022
Merged

Staging Version increment automation #239

merged 4 commits into from
Aug 1, 2022

Conversation

prudhvigodithi
Copy link
Member

@prudhvigodithi prudhvigodithi commented Jul 11, 2022

Signed-off-by: pgodithi pgodithi@amazon.com

Is your feature request related to a problem? Please provide an existing Issue # , or describe.
This is the staging PR for to execute workflows that auto raise the version increment PR's
Example: https://github.com/prudhvigodithi/performance-analyzer/pull/2/files

Describe the solution you are proposing
Part of: opensearch-project/opensearch-build#1375
From solution: opensearch-project/opensearch-build#1375 (comment)
Related issue: #234

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.

Signed-off-by: pgodithi <pgodithi@amazon.com>
@prudhvigodithi
Copy link
Member Author

Referred Old version increment PR to create the automation task.
#237

@prudhvigodithi prudhvigodithi changed the title Version increment automation Staging Version increment automation Jul 11, 2022
@kkhatua kkhatua requested review from sruti1312 and sgup432 July 11, 2022 18:42
sruti1312
sruti1312 previously approved these changes Jul 11, 2022
@prudhvigodithi
Copy link
Member Author

Renaming to task updateVersion following opensearch-project/opensearch-plugin-template-java#32.

@prudhvigodithi
Copy link
Member Author

Hey @kkhatua @sruti1312 can you please take a look.
Thank you

@bbarani
Copy link
Member

bbarani commented Jul 26, 2022

@kkhatua @sruti1312 can you please review this PR soon?

@kkhatua kkhatua self-requested a review July 27, 2022 16:14
@prudhvigodithi
Copy link
Member Author

Hey Just checking back to see if we can merge this PR?
Thank you

@sruti1312 sruti1312 merged commit a587fa8 into opensearch-project:1.x Aug 1, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-239-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a587fa89e75be22be0fd3f59d894fa15813cc409
# Push it to GitHub
git push --set-upstream origin backport/backport-239-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-239-to-1.3.

@prudhvigodithi
Copy link
Member Author

Hey @sgup432 @sruti1312 @kkhatua I see the backport failed for 1.3 branch, can you please check ? If required I will raise a manual PR.
Thank you

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants