From 862890847d4d64924e3eeb065ec795643c056b93 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 21 Jul 2022 17:33:50 +0000 Subject: [PATCH 1/2] Update to use 'macos-latest'. Fixes #674. --- .github/workflows/linux-mac-nceplibs-mpi.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml index 0fa9f8d20..873eeeae4 100644 --- a/.github/workflows/linux-mac-nceplibs-mpi.yml +++ b/.github/workflows/linux-mac-nceplibs-mpi.yml @@ -14,7 +14,7 @@ jobs: CXX: g++-9 strategy: matrix: - os: [macos-10.15, ubuntu-20.04] + os: [macos-latest, ubuntu-20.04] compiler: [gcc-9] nceplibs_version: [develop, 1.4.0] mpi_type: [mpich, openmpi] @@ -29,7 +29,7 @@ jobs: sudo apt-get update sudo apt-get install libpng-dev sudo apt-get install libjpeg-dev - elif [[ ${{ matrix.os }} == "macos-10.15" ]]; then + elif [[ ${{ matrix.os }} == "macos-latest" ]]; then brew update brew install wget if [[ ${{ matrix.compiler }} == "gcc-9" ]]; then @@ -63,7 +63,7 @@ jobs: cd openmpi-4.1.1 if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then ./configure --prefix=$HOME/mpi --enable-mpi-fortran --enable-mpi-cxx - elif [[ ${{ matrix.os }} == "macos-10.15" ]]; then + elif [[ ${{ matrix.os }} == "macos-latest" ]]; then ./configure --prefix=$HOME/mpi --enable-mpi-fortran --enable-mpi-cxx --enable-two-level-namespace fi make -j2 From a6e8b115a8d249b6799a362dd3d0d4e02cae9950 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 21 Jul 2022 17:54:40 +0000 Subject: [PATCH 2/2] Update to latest version of ubuntu. Fixes #674. --- .github/workflows/intel.yml | 2 +- .github/workflows/linux-mac-nceplibs-mpi.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index e817a5961..0e9b88164 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -16,7 +16,7 @@ jobs: CXX: icpc strategy: matrix: - os: [ubuntu-20.04] + os: [ubuntu-latest] steps: diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml index 873eeeae4..51ce41518 100644 --- a/.github/workflows/linux-mac-nceplibs-mpi.yml +++ b/.github/workflows/linux-mac-nceplibs-mpi.yml @@ -14,7 +14,7 @@ jobs: CXX: g++-9 strategy: matrix: - os: [macos-latest, ubuntu-20.04] + os: [macos-latest, ubuntu-latest] compiler: [gcc-9] nceplibs_version: [develop, 1.4.0] mpi_type: [mpich, openmpi] @@ -25,7 +25,7 @@ jobs: - name: install-dependencies run: | echo "$HOME/mpi/bin" >> $GITHUB_PATH - if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then + if [[ ${{ matrix.os }} == "ubuntu-latest" ]]; then sudo apt-get update sudo apt-get install libpng-dev sudo apt-get install libjpeg-dev @@ -61,7 +61,7 @@ jobs: wget https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.1.tar.gz &> /dev/null tar -xzf openmpi-4.1.1.tar.gz cd openmpi-4.1.1 - if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then + if [[ ${{ matrix.os }} == "ubuntu-latest" ]]; then ./configure --prefix=$HOME/mpi --enable-mpi-fortran --enable-mpi-cxx elif [[ ${{ matrix.os }} == "macos-latest" ]]; then ./configure --prefix=$HOME/mpi --enable-mpi-fortran --enable-mpi-cxx --enable-two-level-namespace