Skip to content

Commit

Permalink
attempting to fix macos failures on github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
BlaiseMuhirwa committed Nov 3, 2024
1 parent 98f2a08 commit ff86ad2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Install clang-format and make
run: |
set -ex
sudo apt-get update
sudo apt-get install -y clang-format make
clang-format --version
- name: Check C++ Formatting
run: |
Expand Down Expand Up @@ -48,6 +50,11 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Install libomp (macOS only)
if: runner.os == 'macOS'
run: |
brew install libomp
- name: Set up Poetry
uses: snok/install-poetry@v1
with:
Expand All @@ -66,8 +73,7 @@ jobs:
- name: Run Unit Tests
run: |
cd flatnav_python
poetry run pytest -vs unit_tests
make run-python-unit-tests
run-cpp-unit-tests:
needs: test-clang-format
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ run-cpp-unit-tests: build-cpp
./build/test_distances
./build/test_serialization

run-python-unit-tests:
cd flatnav_python && poetry run pytest -vs unit_tests

setup-clang-cmake-libomp:
./bin/install_clang_and_libomp.sh
./bin/install_cmake.sh

0 comments on commit ff86ad2

Please sign in to comment.