Skip to content

Commit

Permalink
Fix Mac ARM Build (#1960)
Browse files Browse the repository at this point in the history
#### Reference Issues/PRs
<!--Example: Fixes #1234. See also #3456.-->

#### What does this implement or fix?

#### Any other comments?

#### Checklist

<details>
  <summary>
   Checklist for code changes...
  </summary>
 
- [ ] Have you updated the relevant docstrings, documentation and
copyright notice?
- [ ] Is this contribution tested against [all ArcticDB's
features](../docs/mkdocs/docs/technical/contributing.md)?
- [ ] Do all exceptions introduced raise appropriate [error
messages](https://docs.arcticdb.io/error_messages/)?
 - [ ] Are API changes highlighted in the PR description?
- [ ] Is the PR labelled as enhancement or bug so it appears in
autogenerated release notes?
</details>

<!--
Thanks for contributing a Pull Request to ArcticDB! Please ensure you
have taken a look at:
- ArcticDB's Code of Conduct:
https://github.com/man-group/ArcticDB/blob/master/CODE_OF_CONDUCT.md
- ArcticDB's Contribution Licensing:
https://github.com/man-group/ArcticDB/blob/master/docs/mkdocs/docs/technical/contributing.md#contribution-licensing
-->
  • Loading branch information
G-D-Petrov authored Oct 30, 2024
1 parent 56d8611 commit 9d073c6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 9 additions & 1 deletion .github/workflows/build_with_conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ on:
# See: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request
pull_request:

workflow_dispatch:
inputs:
run_on_arm_mac:
description: 'Run on arm macos'
type: boolean
required: false
default: false

jobs:

linux:
Expand Down Expand Up @@ -104,7 +112,7 @@ jobs:
- os: macos-12

fail-fast: false
runs-on: ${{ matrix.os }}
runs-on: ${{ inputs.run_on_arm_mac == true && 'macos-13-xlarge' || matrix.os }}
env:
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
steps:
Expand Down
2 changes: 2 additions & 0 deletions python/tests/integration/arcticdb/test_arctic_move_storage.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import shutil
import sys
import pytest
from pathlib import Path

Expand Down Expand Up @@ -53,6 +54,7 @@ def test_move_storage(storage_type, host_attr, request):
assert dest_host in lib.read("sym").host


@pytest.mark.skipif(sys.platform == "darwin", reason="Test doesn't raise an exception on MacOS ARM")
def test_move_lmdb_library_map_size_reduction(tmp_path: Path):
# Given - any LMDB library
original = tmp_path / "original"
Expand Down

0 comments on commit 9d073c6

Please sign in to comment.