Merge branch 'develop' into ThreeBodyForGeneralSpin

issp-center-dev · May 15, 2024 · 6269ff2 · 6269ff2
2 parents efa6fce + a619d3b
commit 6269ff2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
@@ -11,13 +11,13 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Inject slug/short variables
       uses: rlespinasse/github-slug-action@v4.x
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: main
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,10 @@ jobs:
         mpisize: [1, 4, 16]
         ompsize: [1, 3]
         include:
-          - os: macos-11
+          - os: macos-13
+            mpisize: 1
+            ompsize: 1
+          - os: macos-latest
             mpisize: 1
             ompsize: 1
           - os: ubuntu-20.04
@@ -30,7 +33,7 @@ jobs:
       OMP_NUM_THREADS: ${{ matrix.ompsize }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: apt
         if: ${{ runner.os == 'Linux' }}
@@ -43,9 +46,13 @@ jobs:
         run: |
           brew install openmpi scalapack
 
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
       - name: pip
         run: |
-          python -m pip install numpy
           python3 -m pip install numpy
 
       - name: make workspace
@@ -56,7 +63,7 @@ jobs:
         shell: bash
         run: |
           if [ ${{ runner.os }} = "macOS" ] ; then
-            export FC=gfortran-11
+            export FC=gfortran-12
           fi
           cmake -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE