Skip to content

Commit 0001433

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/Ver.2.0_alpha' into Ver.2.0_alpha
2 parents 930a239 + a742691 commit 0001433

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

.github/workflows/linux_and_macos.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: build
2828
run: |
2929
sudo apt update
30-
sudo apt install pkg-config git gfortran libopenmpi-dev \
30+
sudo apt install pkg-config git libopenmpi-dev \
3131
zlib1g zlib1g-dev libblas-dev libfftw3-dev libhdf5-openmpi-dev
3232
3333
./configure \
@@ -42,21 +42,14 @@ jobs:
4242
4343
Run-on-Mac:
4444
name: test-compile on Mac
45-
runs-on: [macos-14]
45+
runs-on: [macos-15]
4646
steps:
4747
- uses: actions/checkout@v2
4848
- name: build
4949
run: |
50+
brew install gfortran open-mpi fftw hdf5-mpi
5051
brew info gfortran
5152
brew info open-mpi
52-
brew install gfortran
53-
54-
a=`which gfortran-14`; \
55-
b=`dirname $a`; \
56-
c=$b/gfortran; \
57-
ln -s $a $c
58-
59-
brew install open-mpi fftw hdf5-mpi
6053
6154
mpicc -v
6255
mpif90 -v

0 commit comments

Comments
 (0)