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

Updating backport workflow to include custom branch name #173

Merged
merged 1 commit into from
Feb 8, 2022

Conversation

VachaShah
Copy link
Contributor

Signed-off-by: Vacha Shah [email protected]

Description

Updating the backport workflow to resolve permissions issue opensearch-project/OpenSearch#1712 and allow custom branch naming for backport branches to manage branch permissions.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • 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.

@VachaShah VachaShah requested a review from a team February 4, 2022 01:15
@codecov-commenter
Copy link

codecov-commenter commented Feb 4, 2022

Codecov Report

Merging #173 (d5746c5) into main (fdda823) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #173   +/-   ##
=======================================
  Coverage   43.87%   43.87%           
=======================================
  Files         156      156           
  Lines        5181     5181           
  Branches      966      953   -13     
=======================================
  Hits         2273     2273           
  Misses       2690     2690           
  Partials      218      218           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fdda823...d5746c5. Read the comment docs.

Copy link
Member

@amitgalitz amitgalitz left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for making the change!

@ohltyler ohltyler merged commit ad6aa5b into opensearch-project:main Feb 8, 2022
@ohltyler ohltyler mentioned this pull request Feb 14, 2022
1 task
@VachaShah VachaShah deleted the auto-backport branch February 15, 2022 07:47
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x 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.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-173-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ad6aa5ba2c8279235a51d6db349dfa131a30575e
# Push it to GitHub
git push --set-upstream origin backport/backport-173-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 base branch is 1.x and the compare/head branch is backport/backport-173-to-1.x.

ohltyler pushed a commit that referenced this pull request Mar 2, 2022
ohltyler pushed a commit that referenced this pull request Mar 2, 2022
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