Skip to content

Commit 7cedd4c

Browse files
add macos to pixi build matrix (#84)
Co-authored-by: Claudius Haag <[email protected]>
1 parent 506700a commit 7cedd4c

File tree

4 files changed

+46
-11
lines changed

4 files changed

+46
-11
lines changed

.github/workflows/pixi_build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [ubuntu-latest]
20+
os: [ubuntu-latest, macos-latest]
2121
steps:
2222
- name: Checkout code
2323
uses: actions/checkout@v5
@@ -33,8 +33,8 @@ jobs:
3333
- name: Upload test logs
3434
uses: actions/upload-artifact@v4
3535
with:
36-
name: test-logs
37-
path: test/*.log
36+
name: ${{ matrix.os }} test-logs
37+
path: test/output/*.log
3838

3939
- uses: actions/upload-artifact@v4
4040
if: failure()

pixi.lock

Lines changed: 37 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ sympy = ">=1.14.0,<2"
1515
quaternion = ">=2024.0.8,<2025"
1616
beartype = ">=0.21.0,<0.22"
1717
ipykernel = ">=6.29.5,<7"
18+
time = ">=1.9,<2"
1819

1920
[feature.dashboard.pypi-dependencies]
2021
fans-dashboard = { path = "FANS_Dashboard", editable = true }

test/run_tests.sh

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,15 @@ else
1515
FANS_EXEC="./FANS"
1616
fi
1717

18-
TIME_CMD="command time -v"
19-
[[ "$OSTYPE" == "darwin"* ]] && TIME_CMD="command gtime -v"
20-
2118
mkdir -p output
2219

2320
# Run the jobs serially
24-
$TIME_CMD mpiexec -n $num_processes "$FANS_EXEC" input_files/test_LinearThermal.json output/test_LinearThermal.h5 > test_LinearThermal.log 2>&1
21+
command time -v mpiexec -n $num_processes "$FANS_EXEC" input_files/test_LinearThermal.json output/test_LinearThermal.h5 > output/test_LinearThermal.log 2>&1
2522

26-
$TIME_CMD mpiexec -n $num_processes "$FANS_EXEC" input_files/test_LinearElastic.json output/test_LinearElastic.h5 > test_LinearElastic.log 2>&1
23+
command time -v mpiexec -n $num_processes "$FANS_EXEC" input_files/test_LinearElastic.json output/test_LinearElastic.h5 > output/test_LinearElastic.log 2>&1
2724

28-
$TIME_CMD mpiexec -n $num_processes "$FANS_EXEC" input_files/test_PseudoPlastic.json output/test_PseudoPlastic.h5 > test_PseudoPlastic.log 2>&1
25+
command time -v mpiexec -n $num_processes "$FANS_EXEC" input_files/test_PseudoPlastic.json output/test_PseudoPlastic.h5 > output/test_PseudoPlastic.log 2>&1
2926

30-
$TIME_CMD mpiexec -n $num_processes "$FANS_EXEC" input_files/test_J2Plasticity.json output/test_J2Plasticity.h5 > test_J2Plasticity.log 2>&1
27+
command time -v mpiexec -n $num_processes "$FANS_EXEC" input_files/test_J2Plasticity.json output/test_J2Plasticity.h5 > output/test_J2Plasticity.log 2>&1
3128

32-
$TIME_CMD mpiexec -n $num_processes "$FANS_EXEC" input_files/test_MixedBCs.json output/test_MixedBCs.h5 > test_MixedBCs.log 2>&1
29+
command time -v mpiexec -n $num_processes "$FANS_EXEC" input_files/test_MixedBCs.json output/test_MixedBCs.h5 > output/test_MixedBCs.log 2>&1

0 commit comments

Comments
 (0)