Skip to content

Commit 07c4ba7

Browse files
authored
Merge pull request #776 from mkstoyanov/update_githubci
* update the macosx github runner
2 parents 791e602 + 85ab961 commit 07c4ba7

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.github/workflows/build-macos.yaml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,29 @@ jobs:
2020
continue-on-error: false
2121
strategy:
2222
matrix:
23-
runner: [macos-11]
24-
compiler: [clang++, g++-11] # $(brew --prefix llvm)/bin/clang++ (clang-11)
25-
fortran_compiler: [gfortran-11]
23+
runner: [macos-14]
24+
compiler: [clang++]
2625

2726
steps:
2827
- uses: actions/checkout@v2
2928
- name: Install requirements
30-
run: python3 -m pip install numpy
29+
run: >
30+
python3 -m venv tastest && source ./tastest/bin/activate &&
31+
python3 -m pip install pip --upgrade &&
32+
python3 -m pip install numpy
3133
- name: Build
3234
run: >
35+
source ./tastest/bin/activate &&
3336
rm -rf build && mkdir -p build && cd build &&
3437
cmake
3538
-D CMAKE_INSTALL_PREFIX=./TasmanianInstall
3639
-D CMAKE_CXX_FLAGS="-O3 -Wall -Wextra -Wshadow -pedantic"
3740
-D CMAKE_CXX_COMPILER=${{ matrix.compiler }}
38-
-D CMAKE_Fortran_COMPILER=${{ matrix.fortran_compiler }}
39-
-D PYTHON_EXECUTABLE=/usr/local/bin/python3
40-
-D Tasmanian_ENABLE_FORTRAN=ON
41+
-D Tasmanian_ENABLE_FORTRAN=OFF
4142
-D Tasmanian_ENABLE_RECOMMENDED=ON
42-
-D Tasmanian_TESTS_OMP_NUM_THREADS=4 .. &&
43-
make -j4
43+
-D Tasmanian_TESTS_OMP_NUM_THREADS=3 .. &&
44+
make -j3
4445
- name: Test
45-
run: cd build && ctest -j4 -V --no-compress-output -T Test
46+
run: cd build && ctest -V --no-compress-output -T Test
4647
- name: Install
4748
run: cd build && make install && make test_install

.github/workflows/build-ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- uses: actions/checkout@v2
2929
- name: Install requirements
30-
run: python3 -m pip install numpy
30+
run: python3 -m pip install numpy --user
3131
- name: Build
3232
run: >
3333
rm -rf build && mkdir -p build && cd build &&

0 commit comments

Comments
 (0)