From c4d1dab6f3e3148069e6075484b2a117b87a7035 Mon Sep 17 00:00:00 2001 From: Hiro Matsui Date: Mon, 25 Nov 2024 17:13:25 -0800 Subject: [PATCH 1/5] Update linux_and_macos.yml --- .github/workflows/linux_and_macos.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linux_and_macos.yml b/.github/workflows/linux_and_macos.yml index c5131fa5..35ba78b9 100644 --- a/.github/workflows/linux_and_macos.yml +++ b/.github/workflows/linux_and_macos.yml @@ -21,7 +21,7 @@ env: jobs: Run-on-Ubuntu: name: test-compile on Ubuntu - runs-on: [ubuntu-20.04] + runs-on: [ubuntu-latest] steps: - uses: actions/checkout@v2 - name: build @@ -48,15 +48,8 @@ jobs: run: | brew info gfortran brew info open-mpi - brew install gfortran + brew install gfortran open-mpi fftw hdf5-mpi - a=`which gfortran-11`; \ - b=`dirname $a`; \ - c=$b/gfortran; \ - ln -s $a $c - - brew install open-mpi fftw hdf5-mpi - mpicc -v mpif90 -v From f114151e0ed3ea6ac33691e77ca695d342e39fe6 Mon Sep 17 00:00:00 2001 From: Hiro Matsui Date: Mon, 25 Nov 2024 19:06:49 -0800 Subject: [PATCH 2/5] Back to Ubuntu-22.04 for HDF5 --- .github/workflows/linux_and_macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_and_macos.yml b/.github/workflows/linux_and_macos.yml index 35ba78b9..dcf7830d 100644 --- a/.github/workflows/linux_and_macos.yml +++ b/.github/workflows/linux_and_macos.yml @@ -21,7 +21,7 @@ env: jobs: Run-on-Ubuntu: name: test-compile on Ubuntu - runs-on: [ubuntu-latest] + runs-on: [ubuntu-22.04] steps: - uses: actions/checkout@v2 - name: build From f391dc7e1565f8ad194dae1b34f6858f48e6a789 Mon Sep 17 00:00:00 2001 From: Hiro Matsui Date: Mon, 25 Nov 2024 20:08:51 -0800 Subject: [PATCH 3/5] Update linux_and_macos.yml --- .github/workflows/linux_and_macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_and_macos.yml b/.github/workflows/linux_and_macos.yml index dcf7830d..d7c14f5d 100644 --- a/.github/workflows/linux_and_macos.yml +++ b/.github/workflows/linux_and_macos.yml @@ -41,7 +41,7 @@ jobs: Run-on-Mac: name: test-compile on Mac - runs-on: [macos-latest] + runs-on: [macos-14] steps: - uses: actions/checkout@v2 - name: build From d17c20b2050747583c37ef5bd54fcaaabad81b87 Mon Sep 17 00:00:00 2001 From: Hiro Matsui Date: Mon, 25 Nov 2024 20:11:48 -0800 Subject: [PATCH 4/5] Update linux_and_macos.yml --- .github/workflows/linux_and_macos.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux_and_macos.yml b/.github/workflows/linux_and_macos.yml index d7c14f5d..f251134d 100644 --- a/.github/workflows/linux_and_macos.yml +++ b/.github/workflows/linux_and_macos.yml @@ -48,8 +48,15 @@ jobs: run: | brew info gfortran brew info open-mpi - brew install gfortran open-mpi fftw hdf5-mpi + brew install gfortran + a=`which gfortran-11`; \ + b=`dirname $a`; \ + c=$b/gfortran; \ + ln -s $a $c + + brew install open-mpi fftw hdf5-mpi + mpicc -v mpif90 -v From 1460f1088d83233b294ac4748529f03c34d4f4d0 Mon Sep 17 00:00:00 2001 From: Hiro Matsui Date: Mon, 25 Nov 2024 20:14:13 -0800 Subject: [PATCH 5/5] Update linux_and_macos.yml --- .github/workflows/linux_and_macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_and_macos.yml b/.github/workflows/linux_and_macos.yml index f251134d..8425db85 100644 --- a/.github/workflows/linux_and_macos.yml +++ b/.github/workflows/linux_and_macos.yml @@ -50,7 +50,7 @@ jobs: brew info open-mpi brew install gfortran - a=`which gfortran-11`; \ + a=`which gfortran-14`; \ b=`dirname $a`; \ c=$b/gfortran; \ ln -s $a $c