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

Add condition that PRs are merged in backport workflow #5997

Merged
merged 1 commit into from
Jan 24, 2023

Conversation

andrross
Copy link
Member

This brings our backport workflow script in line with the script from the tibdex/backport github action implementation.

Issues Resolved

[List any issues this PR will resolve]

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

@andrross andrross added the backport 2.x Backport to 2.x branch label Jan 24, 2023
@andrross andrross force-pushed the add-backport-condition branch from f3d2395 to 016e266 Compare January 24, 2023 22:08
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@kotwanikunal
Copy link
Member

Thanks @andrross! Hopefully no more backport struggles 🚒

@kotwanikunal
Copy link
Member

Gradle Check (Jenkins) Run Completed with:

fatal: reference is not a tree: f3d23959de29d19ae33a0f1601c81b3a3b9112ec

Force push issue

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@kotwanikunal
Copy link
Member

Gradle Check (Jenkins) Run Completed with:

This will need a merge on #5993

This brings our backport workflow script in line with the script from
the [tibdex/backport][1] github action implementation.

[1]: https://github.com/tibdex/backport/blob/b1bb2aaf611d9f2e5d1900c06493769b9f102a45/.github/workflows/backport.yml#L12-L22

Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross force-pushed the add-backport-condition branch from 016e266 to cf697d1 Compare January 24, 2023 23:07
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@andrross andrross merged commit 715ff72 into opensearch-project:main Jan 24, 2023
@andrross andrross deleted the add-backport-condition branch January 24, 2023 23:42
@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:

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

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

@kotwanikunal
Copy link
Member

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:

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

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

Might have failed because of #5992

andrross added a commit to andrross/OpenSearch that referenced this pull request Jan 25, 2023
…oject#5997)

This brings our backport workflow script in line with the script from
the [tibdex/backport][1] github action implementation.

[1]: https://github.com/tibdex/backport/blob/b1bb2aaf611d9f2e5d1900c06493769b9f102a45/.github/workflows/backport.yml#L12-L22

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 715ff72)
@andrross
Copy link
Member Author

Backport PR: #6002

andrross added a commit to andrross/OpenSearch that referenced this pull request Jan 25, 2023
…oject#5997)

This brings our backport workflow script in line with the script from
the [tibdex/backport][1] github action implementation.

[1]: https://github.com/tibdex/backport/blob/b1bb2aaf611d9f2e5d1900c06493769b9f102a45/.github/workflows/backport.yml#L12-L22

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 715ff72)
andrross added a commit that referenced this pull request Jan 25, 2023
This brings our backport workflow script in line with the script from
the [tibdex/backport][1] github action implementation.

[1]: https://github.com/tibdex/backport/blob/b1bb2aaf611d9f2e5d1900c06493769b9f102a45/.github/workflows/backport.yml#L12-L22

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 715ff72)
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 skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants