From 58a2823531716af13f8f7a11bf826ce021a901dc Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 28 Mar 2023 21:47:49 -0700 Subject: [PATCH] CI: Test on Ubuntu 20.04 Transition the Ubuntu OS from 18 to 20 LTS. Time to finally drop clang 6 :tada: --- .../spack.yaml | 10 +++---- .../spack.yaml | 10 +++---- .../gcc7_py36_ompi_h5_ad1_ad2/spack.yaml | 2 +- .github/workflows/linux.yml | 26 +++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) rename .github/ci/spack-envs/{clang6_nopy_nompi_h5_libcpp => clang7_nopy_nompi_h5_libcpp}/spack.yaml (79%) rename .github/ci/spack-envs/{clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp => clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp}/spack.yaml (88%) diff --git a/.github/ci/spack-envs/clang6_nopy_nompi_h5_libcpp/spack.yaml b/.github/ci/spack-envs/clang7_nopy_nompi_h5_libcpp/spack.yaml similarity index 79% rename from .github/ci/spack-envs/clang6_nopy_nompi_h5_libcpp/spack.yaml rename to .github/ci/spack-envs/clang7_nopy_nompi_h5_libcpp/spack.yaml index 41c6744eab..9e22b6a7f4 100644 --- a/.github/ci/spack-envs/clang6_nopy_nompi_h5_libcpp/spack.yaml +++ b/.github/ci/spack-envs/clang7_nopy_nompi_h5_libcpp/spack.yaml @@ -12,7 +12,7 @@ spack: all: target: [x86_64] variants: ~mpi ~fortran - compiler: [clang@6.0.0] + compiler: [clang@7.0.1] compilers: - compiler: @@ -22,13 +22,13 @@ spack: cxxflags: -stdlib=libc++ ldflags: -stdlib=libc++ modules: [] - operating_system: ubuntu18.04 + operating_system: ubuntu20.04 paths: - cc: /usr/lib/llvm-6.0/bin/clang - cxx: /usr/lib/llvm-6.0/bin/clang++ + cc: /usr/bin/clang-7 + cxx: /usr/bin/clang++-7 f77: null fc: null - spec: clang@6.0.0 + spec: clang@7.0.1 target: x86_64 config: diff --git a/.github/ci/spack-envs/clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp/spack.yaml b/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp/spack.yaml similarity index 88% rename from .github/ci/spack-envs/clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp/spack.yaml rename to .github/ci/spack-envs/clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp/spack.yaml index bae2afb9f8..5308c57ce5 100644 --- a/.github/ci/spack-envs/clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp/spack.yaml +++ b/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp/spack.yaml @@ -41,7 +41,7 @@ spack: variants: ~fortran providers: mpi: [openmpi] - compiler: [clang@6.0.0] + compiler: [clang@7.0.1] compilers: - compiler: @@ -51,13 +51,13 @@ spack: cxxflags: -stdlib=libc++ ldflags: -stdlib=libc++ modules: [] - operating_system: ubuntu18.04 + operating_system: ubuntu20.04 paths: - cc: /usr/lib/llvm-6.0/bin/clang - cxx: /usr/lib/llvm-6.0/bin/clang++ + cc: /usr/bin/clang-7 + cxx: /usr/bin/clang++-7 f77: /usr/bin/gfortran fc: /usr/bin/gfortran - spec: clang@6.0.0 + spec: clang@7.0.1 target: x86_64 config: diff --git a/.github/ci/spack-envs/gcc7_py36_ompi_h5_ad1_ad2/spack.yaml b/.github/ci/spack-envs/gcc7_py36_ompi_h5_ad1_ad2/spack.yaml index 7662512e8e..f0b051678e 100644 --- a/.github/ci/spack-envs/gcc7_py36_ompi_h5_ad1_ad2/spack.yaml +++ b/.github/ci/spack-envs/gcc7_py36_ompi_h5_ad1_ad2/spack.yaml @@ -47,7 +47,7 @@ spack: extra_rpaths: [] flags: {} modules: [] - operating_system: ubuntu18.04 + operating_system: ubuntu20.04 paths: cc: /usr/bin/gcc-7 cxx: /usr/bin/g++-7 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f19b4788d5..17226a99d6 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -7,26 +7,26 @@ concurrency: cancel-in-progress: true jobs: - clang6_nopy_nompi_h5_libcpp: - runs-on: ubuntu-18.04 + clang7_nopy_nompi_h5_libcpp: + runs-on: ubuntu-20.04 if: github.event.pull_request.draft == false steps: - uses: actions/checkout@v3 - name: Spack Cache uses: actions/cache@v3 - with: {path: /opt/spack, key: clang6_nopy_nompi_h5_libcpp_v2 } + with: {path: /opt/spack, key: clang7_nopy_nompi_h5_libcpp_v2} - name: Install run: | sudo apt-get update - sudo apt-get install clang-6.0 libc++-dev libc++abi-dev + sudo apt-get install clang-7 libc++-7-dev libc++abi-7-dev sudo .github/workflows/dependencies/install_spack - name: Build - env: {CC: clang-6.0, CXX: clang++-6.0, CXXFLAGS: -stdlib=libc++ -Werror -Wno-ignored-attributes -Wno-unused-const-variable} + env: {CC: clang-7, CXX: clang++-7, CXXFLAGS: -stdlib=libc++ -Werror -Wno-ignored-attributes -Wno-unused-const-variable} # -Wno-ignored-attributes -Wno-unused-const-variable: clang-6 has a # false positive on src/auxiliary/Filesystem.cpp # [[maybe_unused]] MPI_Datatype const MPI_Types< unsigned >::value = MPI_UNSIGNED; run: | - eval $(spack env activate --sh .github/ci/spack-envs/clang6_nopy_nompi_h5_libcpp/) + eval $(spack env activate --sh .github/ci/spack-envs/clang7_nopy_nompi_h5_libcpp/) spack install share/openPMD/download_samples.sh build @@ -39,21 +39,21 @@ jobs: cmake --build build --parallel 2 ctest --test-dir build --output-on-failure - clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp: - runs-on: ubuntu-18.04 + clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp: + runs-on: ubuntu-20.04 if: github.event.pull_request.draft == false steps: - uses: actions/checkout@v3 - name: Spack Cache uses: actions/cache@v3 - with: {path: /opt/spack, key: clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp_v2 } + with: {path: /opt/spack, key: clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp_v2} - name: Install run: | sudo apt-get update - sudo apt-get install clang-6.0 libc++-dev libc++abi-dev gfortran libopenmpi-dev python3 + sudo apt-get install clang-7 libc++-7-dev libc++abi-7-dev gfortran libopenmpi-dev python3 sudo .github/workflows/dependencies/install_spack - name: Build - env: {CC: clang-6.0, CXX: clang++-6.0, CXXFLAGS: -stdlib=libc++ -Werror -Wno-ignored-attributes -Wno-unused-const-variable} + env: {CC: clang-7, CXX: clang++-7, CXXFLAGS: -stdlib=libc++ -Werror -Wno-ignored-attributes -Wno-unused-const-variable} # -Wno-ignored-attributes -Wno-unused-const-variable: clang-6 has a # false positive on src/auxiliary/Filesystem.cpp # [[maybe_unused]] MPI_Datatype const MPI_Types< unsigned >::value = MPI_UNSIGNED; @@ -62,7 +62,7 @@ jobs: mpiexec --version perl --version python --version - eval $(spack env activate --sh .github/ci/spack-envs/clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp/) + eval $(spack env activate --sh .github/ci/spack-envs/clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp/) spack install share/openPMD/download_samples.sh build @@ -202,7 +202,7 @@ jobs: # gcc-7.4.0_py_ompi_h5_ad1_ad2_coveralls gcc7_py36_pd_dd_ompi_h5_ad1_ad2: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 if: github.event.pull_request.draft == false steps: - uses: actions/checkout@v3