From 429e625d0996d540ed2e7238e9b048700f327ec7 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 27 May 2021 15:31:16 -0400 Subject: [PATCH] [ghactions] Bump ubuntu builds to clang12 and osx builds to gcc11 --- .github/workflows/build.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9e2d12bb..70ec2b7e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,8 @@ jobs: matrix: include: - {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10} - - {os: ubuntu-20.04, cc: clang-10, cxx: clang++-10} - - {os: macos-10.15, cc: gcc-10, cxx: g++-10} + - {os: ubuntu-20.04, cc: clang-12, cxx: clang++-12} + - {os: macos-10.15, cc: gcc-11, cxx: g++-11} - {os: macos-10.15, cc: /usr/local/opt/llvm/bin/clang, cxx: /usr/local/opt/llvm/bin/clang++} runs-on: ${{ matrix.os }} @@ -27,18 +27,20 @@ jobs: if: matrix.os == 'ubuntu-20.04' run: > sudo apt-get update && + sudo apt-get install lsb-release wget software-properties-common && + wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && sudo chmod +x /tmp/llvm.sh && sudo /tmp/llvm.sh 12 && sudo apt-get install - clang-10 + clang-12 g++-10 gfortran hdf5-tools libblas-dev libboost-dev - libclang-10-dev - libc++-10-dev - libc++abi-10-dev + libclang-12-dev + libc++-12-dev + libc++abi-12-dev libfftw3-dev - libgfortran4 + libgfortran5 libgmp-dev libhdf5-dev liblapack-dev @@ -46,7 +48,7 @@ jobs: openmpi-bin openmpi-common openmpi-doc - python3-clang-10 + python3-clang-12 python3-dev python3-mako python3-matplotlib @@ -60,7 +62,7 @@ jobs: - name: Install homebrew dependencies if: matrix.os == 'macos-10.15' run: | - brew install gcc@10 llvm boost fftw hdf5 open-mpi openblas + brew install gcc@11 llvm boost fftw hdf5 open-mpi openblas pip3 install mako numpy scipy mpi4py pip3 install -r requirements.txt