-
Notifications
You must be signed in to change notification settings - Fork 75
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 for version increment automation #608
Conversation
Signed-off-by: pgodithi <[email protected]>
Sample PR |
Codecov Report
@@ Coverage Diff @@
## main #608 +/- ##
============================================
- Coverage 79.07% 79.05% -0.03%
+ Complexity 4213 4209 -4
============================================
Files 296 296
Lines 17686 17686
Branches 1880 1880
============================================
- Hits 13986 13981 -5
- Misses 2805 2806 +1
- Partials 895 899 +4
Flags with carried forward coverage won't be shown. Click here to find out more.
|
Signed-off-by: pgodithi <[email protected]>
Renaming to task |
@prudhvigodithi does this also handle moving main to 3.0.0-SNAPSHOT for example? |
Hey @amitgalitz , following the discussion, |
@amitgalitz @sean-zheng-amazon can you please review this PR soon? |
@prudhvigodithi Once merged will this autochange AD main to whatever Opensearch main is at? for now 3.0.0-SNAPSHOT? |
Its not letting me re-run the whitesource check for some reason |
Hey @amitgalitz once PR is merged the gradle project should output the task |
got it, so once this is merged, next step is to make sure we align plugin branches with core? |
Right @amitgalitz, then the workflow will be triggered to compare to execute |
@prudhvigodithi have you had whitesource check failures on any of the other repos with this PR? |
@prudhvigodithi I'm concerned with aligning plugin branches with core. The outlined strategy is to have different branching strategies between plugins and core. |
Hey @ohltyler the document should be updated, opensearch-project/opensearch-plugins#142 (comment) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Hey Can we please merge this PR and backport to all release branches :) |
The backport to
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.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-608-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 eb7bd07774658c7e0216e5436cfc613b15547d3d
# Push it to GitHub
git push --set-upstream origin backport/backport-608-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x Then, create a pull request where the |
The backport to
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-608-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 eb7bd07774658c7e0216e5436cfc613b15547d3d
# Push it to GitHub
git push --set-upstream origin backport/backport-608-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 |
Signed-off-by: pgodithi <[email protected]> (cherry picked from commit eb7bd07)
The backport to
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-2.0 2.0
# Navigate to the new working tree
cd .worktrees/backport-2.0
# Create a new branch
git switch --create backport/backport-608-to-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 eb7bd07774658c7e0216e5436cfc613b15547d3d
# Push it to GitHub
git push --set-upstream origin backport/backport-608-to-2.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.0 Then, create a pull request where the |
Signed-off-by: pgodithi <[email protected]> (cherry picked from commit eb7bd07)
@prudhvigodithi the backports failed for some branches due to merge conflicts for |
Signed-off-by: pgodithi <[email protected]> (cherry picked from commit eb7bd07) Signed-off-by: prudhvigodithi <[email protected]>
Signed-off-by: pgodithi <[email protected]> (cherry picked from commit eb7bd07) Signed-off-by: prudhvigodithi <[email protected]>
Signed-off-by: pgodithi <[email protected]> (cherry picked from commit eb7bd07) Signed-off-by: prudhvigodithi <[email protected]>
Signed-off-by: pgodithi <[email protected]> (cherry picked from commit eb7bd07) Signed-off-by: prudhvigodithi <[email protected]>
Signed-off-by: pgodithi [email protected]
Description
This is the staging PR for to execute workflows that auto raise the version increment PR's
Example: prudhvigodithi#1
Issues Resolved
Part of: opensearch-project/opensearch-build#1375
From solution: opensearch-project/opensearch-build#1375 (comment)
Related issue: #605
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.