From 8a50fe66eac67b0ceceef6cf1d4e5915dd0722c9 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Thu, 2 May 2024 17:55:39 +0900 Subject: [PATCH 1/2] update versions --- .github/workflows/deploy_docs.yml | 4 ++-- .github/workflows/main.yml | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index 48e324f7..eced6042 100644 --- 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 index e04447f9..334539b1 100644 --- 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' }} @@ -56,7 +59,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 From cc71904a9bbb53222d91e136ac1527393e866ca5 Mon Sep 17 00:00:00 2001 From: Yuichi Motoyama Date: Thu, 2 May 2024 18:00:33 +0900 Subject: [PATCH 2/2] use setup-python --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 334539b1..27edaecc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,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