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

Switch to arm64 runners on macOS #794

Merged
merged 1 commit into from
Jul 19, 2024

Conversation

dbwiddis
Copy link
Member

Description

Switches the CI GitHub runners for macOS to macos-latest now that an OpenSearch arm64 build is available.

Related Issues

Resolves #712

Check List

  • [ ] New functionality includes testing.
  • [ ] New functionality has been documented.
  • [ ] API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • [ ] Public documentation issue/PR created.

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

codecov bot commented Jul 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.76%. Comparing base (f40890c) to head (2665ade).

Additional details and impacted files
@@             Coverage Diff              @@
##               main     #794      +/-   ##
============================================
+ Coverage     75.68%   75.76%   +0.07%     
  Complexity      833      833              
============================================
  Files            88       88              
  Lines          4035     4035              
  Branches        371      371              
============================================
+ Hits           3054     3057       +3     
+ Misses          828      824       -4     
- Partials        153      154       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@owaiskazi19 owaiskazi19 merged commit f3a9e99 into opensearch-project:main Jul 19, 2024
23 checks passed
@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/flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-794-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f3a9e99665711d7b7183aef5a4ff60038f21c285
# Push it to GitHub
git push --set-upstream origin backport/backport-794-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.x

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

@dbwiddis dbwiddis deleted the mac-arm64 branch July 20, 2024 04:05
dbwiddis added a commit to dbwiddis/flow-framework that referenced this pull request Jul 20, 2024
amitgalitz pushed a commit that referenced this pull request Jul 22, 2024
Switch to arm64 runners on macOS (#794)

Signed-off-by: Daniel Widdis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CI] Return GHA to macos-latest when arm64 builds are enabled
3 participants