Skip to content

Commit

Permalink
Update workflows to use latest macOS and ubuntu (#675)
Browse files Browse the repository at this point in the history
Fixes #674.
  • Loading branch information
GeorgeGayno-NOAA authored Jul 25, 2022
1 parent a567090 commit 5c6ddb1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
CXX: icpc
strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-latest]

steps:

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/linux-mac-nceplibs-mpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
CXX: g++-9
strategy:
matrix:
os: [macos-10.15, ubuntu-20.04]
os: [macos-latest, ubuntu-latest]
compiler: [gcc-9]
nceplibs_version: [develop, 1.4.0]
mpi_type: [mpich, openmpi]
Expand All @@ -25,11 +25,11 @@ 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
elif [[ ${{ matrix.os }} == "macos-10.15" ]]; then
elif [[ ${{ matrix.os }} == "macos-latest" ]]; then
brew update
brew install wget
if [[ ${{ matrix.compiler }} == "gcc-9" ]]; then
Expand Down Expand Up @@ -61,9 +61,9 @@ 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-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
Expand Down

0 comments on commit 5c6ddb1

Please sign in to comment.