Skip to content

Commit e339099

Browse files
committed
attempt to fix mac build
1 parent 50b9726 commit e339099

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

.github/workflows/mac.yml

+17-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
name: CI MacOS
33

44
on:
5+
push:
6+
branches: [ "master" ]
7+
pull_request:
8+
branches: [ "master" ]
59
workflow_dispatch:
610

711
jobs:
@@ -33,7 +37,7 @@ jobs:
3337
id: ccache-restore
3438
uses: actions/cache/restore@v3
3539
with:
36-
path: /home/runner/.cache/ccache
40+
path: /Users/runner/Library/Caches/ccache
3741
key: ccache-mac-${{ matrix.py-version }}
3842

3943
- name: Setup GNU Fortran
@@ -73,7 +77,7 @@ jobs:
7377
if: always()
7478
uses: actions/cache/save@v3
7579
with:
76-
path: /home/runner/.cache/ccache
80+
path: /Users/runner/Library/Caches/ccache
7781
key: ccache-mac-${{ matrix.py-version }}
7882

7983
- name: Ccache report
@@ -82,11 +86,20 @@ jobs:
8286

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

8791
- name: Archive test results
8892
uses: actions/upload-artifact@v3
8993
if: always()
9094
with:
9195
name: Test results
92-
path: data.hdf5
96+
path: test-results-${{ matrix.py-version }}.xml
97+
98+
- name: Report test results
99+
uses: dorny/test-reporter@v1
100+
if: always()
101+
with:
102+
name: Test report (Mac, Python ${{ matrix.py-version }})
103+
path: test-results-Mac-${{ matrix.py-version }}.xml
104+
reporter: java-junit
105+
fail-on-error: true

base/PyNucleus_base/tupleDict.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ cdef inline int compareIndices(const void *pa, const void *pb) noexcept nogil:
143143
cdef:
144144
INDEX_t a = (<INDEX_t *> pa)[0]
145145
INDEX_t b = (<INDEX_t *> pb)[0]
146-
return a > b
146+
return a-b
147147

148148

149149
cdef class arrayIndexSet(indexSet):

0 commit comments

Comments
 (0)