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 developer guide to include M1 Setup #1222

Merged

Conversation

ryanbogan
Copy link
Member

Description

Updates developer guide to include setup on Mac M1 machines

Issues Resolved

#580

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as 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: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
DEVELOPER_GUIDE.md Show resolved Hide resolved
DEVELOPER_GUIDE.md Show resolved Hide resolved
DEVELOPER_GUIDE.md Show resolved Hide resolved
navneet1v
navneet1v previously approved these changes Oct 11, 2023
@navneet1v navneet1v self-requested a review October 11, 2023 16:49
heemin32
heemin32 previously approved these changes Oct 11, 2023
Signed-off-by: Ryan Bogan <[email protected]>
@ryanbogan ryanbogan dismissed stale reviews from heemin32 and navneet1v via 791f0de October 11, 2023 21:22
@codecov
Copy link

codecov bot commented Oct 11, 2023

Codecov Report

Merging #1222 (e790745) into main (b0f0d9f) will decrease coverage by 0.01%.
Report is 5 commits behind head on main.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1222      +/-   ##
============================================
- Coverage     85.07%   85.07%   -0.01%     
  Complexity     1210     1210              
============================================
  Files           160      160              
  Lines          4932     4930       -2     
  Branches        449      449              
============================================
- Hits           4196     4194       -2     
  Misses          537      537              
  Partials        199      199              

see 1 file with indirect coverage changes

navneet1v
navneet1v previously approved these changes Oct 12, 2023
heemin32
heemin32 previously approved these changes Oct 12, 2023
CHANGELOG.md Outdated Show resolved Hide resolved
@ryanbogan ryanbogan dismissed stale reviews from heemin32 and navneet1v via e790745 October 18, 2023 16:48
Co-authored-by: Heemin Kim <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
@martin-gaievski martin-gaievski merged commit 318cf48 into opensearch-project:main Oct 20, 2023
36 of 42 checks passed
@ryanbogan ryanbogan deleted the update_developer_guide branch October 20, 2023 18:06
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

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-1222-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 318cf481d8d240b533f7fc2ccb4901b01913146e
# Push it to GitHub
git push --set-upstream origin backport/backport-1222-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-1222-to-2.x.

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.

5 participants