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

Updates backport workflow #2074

Merged

Conversation

DarshitChanpura
Copy link
Member

Description

Updates backport workflow to allow adding backport failure labels to failed auto-backports.

Category

Maintenance

Why these changes are required?

To allow easier tracking of failed backport PRs.

What is the old behavior before changes and new behavior after changes?

No tracking before this change.

Issues Resolved

Check List

- [ ] New functionality includes testing
- [ ] New functionality has been documented

  • 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: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura DarshitChanpura added backport 2.0 backport to 2.0 branch backport 2.x backport to 2.x branch labels Jul 30, 2024
@DarshitChanpura DarshitChanpura removed the backport 2.0 backport to 2.0 branch label Jul 30, 2024
Copy link

codecov bot commented Jul 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.17%. Comparing base (0ed2cf2) to head (85dda20).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2074   +/-   ##
=======================================
  Coverage   71.17%   71.17%           
=======================================
  Files          96       96           
  Lines        2598     2598           
  Branches      387      387           
=======================================
  Hits         1849     1849           
  Misses        649      649           
  Partials      100      100           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@derek-ho derek-ho merged commit 54955ff into opensearch-project:main Jul 30, 2024
21 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 30, 2024
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit 54955ff)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
derek-ho pushed a commit that referenced this pull request Jul 30, 2024
(cherry picked from commit 54955ff)

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@derek-ho derek-ho added backport 2.x backport to 2.x branch and removed backport 2.x backport to 2.x branch labels Jul 30, 2024
@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/security-dashboards-plugin/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport/backport-2074-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 54955ff8c1f9b37afa2df60503d17bef5702282b
# Push it to GitHub
git push --set-upstream origin backport/backport-2074-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-dashboards-plugin/backport-2.x

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

@derek-ho
Copy link
Collaborator

Looks like it worked. @DarshitChanpura thank you

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

Successfully merging this pull request may close these issues.

Add a backport-failed label to failed backports
3 participants