Skip to content

Include feature branch in workflow to trigger CI#102

Merged
naveentatikonda merged 1 commit into
opensearch-project:mainfrom
naveentatikonda:include_feature_branch_pattern_CI
Jul 30, 2022
Merged

Include feature branch in workflow to trigger CI#102
naveentatikonda merged 1 commit into
opensearch-project:mainfrom
naveentatikonda:include_feature_branch_pattern_CI

Conversation

@naveentatikonda
Copy link
Copy Markdown
Member

Signed-off-by: Naveen Tatikonda navtat@amazon.com

Description

Include feature branch to trigger CI on push and pull_request events.

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.

Signed-off-by: Naveen Tatikonda <navtat@amazon.com>
@naveentatikonda naveentatikonda requested a review from a team July 29, 2022 20:49
Copy link
Copy Markdown
Member

@vamshin vamshin 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

@naveentatikonda naveentatikonda merged commit 3fa3259 into opensearch-project:main Jul 30, 2022
@VijayanB VijayanB added backport 2.x Backport PR to 2.x branch and removed backport 2.x Backport PR to 2.x branch labels Jul 30, 2022
@opensearch-trigger-bot
Copy link
Copy Markdown
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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-102-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3fa3259ca3b70ed32140cfdc4abc9b2c18eed24f
# Push it to GitHub
git push --set-upstream origin backport/backport-102-to-2.x
# Go back to the original working tree
cd ../..
# 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-102-to-2.x.

@heemin32 heemin32 added the v2.4.0 'Issues and PRs related to version v2.4.0' label Nov 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.x Backport PR to 2.x branch v2.4.0 'Issues and PRs related to version v2.4.0'

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants