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

Update PULL_REQUEST_TEMPLATE to include an API spec change in the checklist. #4533

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

dblock
Copy link
Member

@dblock dblock commented Jul 8, 2024

Coming from opensearch-project/opensearch-api-specification#387, update PR template to include a checkbox that requests that all API changes be documented in the OpenAPI spec used to generate clients.

@reta reta merged commit 4f3ea97 into opensearch-project:main Jul 9, 2024
42 checks passed
@dblock dblock deleted the update-pull-request-template branch July 9, 2024 13:12
@DarshitChanpura DarshitChanpura added the backport 2.x backport to 2.x branch label Jul 9, 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/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-4533-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4f3ea970914b7b70566e1ec7a73be49d4c8335c4
# Push it to GitHub
git push --set-upstream origin backport/backport-4533-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

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

@DarshitChanpura
Copy link
Member

Adding a backport label in case there are updates being made directly to 2.x

DarshitChanpura pushed a commit to DarshitChanpura/security that referenced this pull request Jul 9, 2024
DarshitChanpura pushed a commit to DarshitChanpura/security that referenced this pull request Jul 9, 2024
…cklist. (opensearch-project#4533)

Signed-off-by: dblock <[email protected]>
(cherry picked from commit 4f3ea97)
Signed-off-by: Darshit Chanpura <[email protected]>
willyborankin pushed a commit that referenced this pull request Jul 9, 2024
…ange in the checklist. (#4533) (#4536)

Signed-off-by: dblock <[email protected]>
Signed-off-by: Darshit Chanpura <[email protected]>
Co-authored-by: Daniel (dB.) Doubrovkine <[email protected]>
prabhask5 pushed a commit to prabhask5/opensearch-security that referenced this pull request Jul 10, 2024
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.

4 participants