From eebd839d6a5c3b1dd37cb795e71fa92311fbff2e Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sat, 11 Nov 2023 17:30:28 -0500 Subject: [PATCH] CI: Update OS --- .github/workflows/CI.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 78e370a..b4d20d2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,14 +14,14 @@ jobs: strategy: matrix: os: - - ubuntu-20.04 - - macos-11 + - ubuntu-22.04 + - macos-12 #TODO - windows-2019 mpi: [MPICH, OpenMPI, MSMPI] exclude: - - os: ubuntu-20.04 + - os: ubuntu-22.04 mpi: MSMPI - - os: macos-11 + - os: macos-12 mpi: MSMPI - os: windows-2019 mpi: MPICH @@ -31,7 +31,7 @@ jobs: runs-on: ${{matrix.os}} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install ${{matrix.mpi}} shell: bash @@ -57,17 +57,17 @@ jobs: # brew install $packages # Install MacPorts - wget https://github.com/macports/macports-base/releases/download/v2.7.1/MacPorts-2.7.1-11-BigSur.pkg - sudo /usr/sbin/installer -pkg MacPorts-2.7.1-11-BigSur.pkg -target / - rm MacPorts-2.7.1-11-BigSur.pkg + wget https://github.com/macports/macports-base/releases/download/v2.8.1/MacPorts-2.8.1-12-Monterey.pkg + sudo /usr/sbin/installer -pkg MacPorts-2.8.1-12-Monterey.pkg -target / + rm MacPorts-2.8.1-12-Monterey.pkg echo /opt/local/bin >> $GITHUB_PATH echo /opt/local/sbin >> $GITHUB_PATH export "PATH=/opt/local/bin:/opt/local/sbin:$PATH" sudo port sync case "${{matrix.mpi}}" in - MPICH) packages='mpich-gcc10 +fortran';; - OpenMPI) packages='openmpi-gcc11 +fortran';; + MPICH) packages='mpich-gcc12 +fortran';; + OpenMPI) packages='openmpi-gcc12 +fortran';; esac sudo port install $packages ;; @@ -101,16 +101,16 @@ jobs: MPICH) # The compiler wrappers have non-standard names cmake -B ${{github.workspace}}/build \ - -DCMAKE_C_COMPILER=mpicc-mpich-gcc10 \ - -DMPIEXEC_EXECUTABLE=/opt/local/bin/mpiexec-mpich-gcc10 \ + -DCMAKE_C_COMPILER=mpicc-mpich-gcc12 \ + -DMPIEXEC_EXECUTABLE=/opt/local/bin/mpiexec-mpich-gcc12 \ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ -DCMAKE_INSTALL_PREFIX=${HOME}/mpiconstants ;; OpenMPI) # The compiler wrappers have non-standard names cmake -B ${{github.workspace}}/build \ - -DCMAKE_C_COMPILER=mpicc-openmpi-gcc11 \ - -DMPIEXEC_EXECUTABLE=/opt/local/bin/mpiexec-openmpi-gcc11 \ + -DCMAKE_C_COMPILER=mpicc-openmpi-gcc12 \ + -DMPIEXEC_EXECUTABLE=/opt/local/bin/mpiexec-openmpi-gcc12 \ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ -DCMAKE_INSTALL_PREFIX=${HOME}/mpiconstants ;;