Skip to content

Commit

Permalink
attempt to fix mac build
Browse files Browse the repository at this point in the history
  • Loading branch information
cgcgcg committed Oct 29, 2023
1 parent 50b9726 commit e339099
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
21 changes: 17 additions & 4 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
name: CI MacOS

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -33,7 +37,7 @@ jobs:
id: ccache-restore
uses: actions/cache/restore@v3
with:
path: /home/runner/.cache/ccache
path: /Users/runner/Library/Caches/ccache
key: ccache-mac-${{ matrix.py-version }}

- name: Setup GNU Fortran
Expand Down Expand Up @@ -73,7 +77,7 @@ jobs:
if: always()
uses: actions/cache/save@v3
with:
path: /home/runner/.cache/ccache
path: /Users/runner/Library/Caches/ccache
key: ccache-mac-${{ matrix.py-version }}

- name: Ccache report
Expand All @@ -82,11 +86,20 @@ jobs:

- name: Run tests
if: always()
run: drivers/runFractional.py --hdf5Output=data.hdf5 --skipPlots --saveOperators
run: python3 -m pytest --junit-xml=test-results-Mac-${{ matrix.py-version }}.xml tests/

- name: Archive test results
uses: actions/upload-artifact@v3
if: always()
with:
name: Test results
path: data.hdf5
path: test-results-${{ matrix.py-version }}.xml

- name: Report test results
uses: dorny/test-reporter@v1
if: always()
with:
name: Test report (Mac, Python ${{ matrix.py-version }})
path: test-results-Mac-${{ matrix.py-version }}.xml
reporter: java-junit
fail-on-error: true
2 changes: 1 addition & 1 deletion base/PyNucleus_base/tupleDict.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ cdef inline int compareIndices(const void *pa, const void *pb) noexcept nogil:
cdef:
INDEX_t a = (<INDEX_t *> pa)[0]
INDEX_t b = (<INDEX_t *> pb)[0]
return a > b
return a-b


cdef class arrayIndexSet(indexSet):
Expand Down

0 comments on commit e339099

Please sign in to comment.