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

Adjusted maven publish workflow to execute automatically when merging a PR. #1531

Merged

Conversation

AWSHurneyt
Copy link
Collaborator

Issue #, if available:

Description of changes:
Adjusted maven publish workflow to execute automatically when merging a PR.

CheckList:

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

Copy link
Collaborator

@goyamegh goyamegh left a comment

Choose a reason for hiding this comment

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

Thanks for taking this up!

@AWSHurneyt AWSHurneyt merged commit 7ee7915 into opensearch-project:main Apr 30, 2024
18 of 21 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 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/alerting/backport-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-1.3
# Create a new branch
git switch --create backport-1531-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7ee7915704ccf9ed2cb231e6fb63f86b121eae43
# Push it to GitHub
git push --set-upstream origin backport-1531-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-1.3

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 30, 2024
… a PR. (#1531)

Signed-off-by: AWSHurneyt <[email protected]>
(cherry picked from commit 7ee7915)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 30, 2024
… a PR. (#1531)

Signed-off-by: AWSHurneyt <[email protected]>
(cherry picked from commit 7ee7915)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@AWSHurneyt
Copy link
Collaborator Author

Removed backport 1.3 label. That branch already has these changes.

AWSHurneyt pushed a commit that referenced this pull request Apr 30, 2024
… a PR. (#1531) (#1532)

(cherry picked from commit 7ee7915)

Signed-off-by: AWSHurneyt <[email protected]>
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>
AWSHurneyt pushed a commit that referenced this pull request Apr 30, 2024
… a PR. (#1531) (#1533)

(cherry picked from commit 7ee7915)

Signed-off-by: AWSHurneyt <[email protected]>
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>
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.

4 participants