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

[Doc] Checklist to fix issue "could not find Docker environment" on macOS #477

Merged
merged 2 commits into from
Jul 29, 2024

Conversation

LantaoJin
Copy link
Member

Description

Update DEVELOPER_GUIDE.md to resolve integration test failures in MacOS.

Issues Resolved

#476

Check List

  • Updated documentation
  • [-] Implemented unit tests
  • [-] Implemented tests for combination with other commands
  • 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.

@LantaoJin LantaoJin marked this pull request as ready for review July 26, 2024 03:20
@LantaoJin
Copy link
Member Author

cc @ykmr1224 @YANG-DB

Copy link
Collaborator

@dai-chen dai-chen left a comment

Choose a reason for hiding this comment

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

Thanks!

@dai-chen dai-chen added the documentation Improvements or additions to documentation label Jul 26, 2024
@dai-chen dai-chen merged commit c6ab291 into opensearch-project:main Jul 29, 2024
5 checks passed
@YANG-DB YANG-DB added Lang:PPL Pipe Processing Language support backport 0.5 labels Aug 14, 2024
@opensearch-trigger-bot
Copy link

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 0.5 documentation Improvements or additions to documentation Lang:PPL Pipe Processing Language support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants