Skip to content

Commit 7813b6f

Browse files
authored
CI: Test on Ubuntu 20.04 (#1408)
Transition the Ubuntu OS from 18 to 20 LTS. Time to finally drop clang 6 🎉
1 parent ce0f071 commit 7813b6f

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

.github/ci/spack-envs/clang6_nopy_nompi_h5_libcpp/spack.yaml renamed to .github/ci/spack-envs/clang7_nopy_nompi_h5_libcpp/spack.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spack:
1212
all:
1313
target: [x86_64]
1414
variants: ~mpi ~fortran
15-
compiler: [clang@6.0.0]
15+
compiler: [clang@7.0.1]
1616

1717
compilers:
1818
- compiler:
@@ -22,13 +22,13 @@ spack:
2222
cxxflags: -stdlib=libc++
2323
ldflags: -stdlib=libc++
2424
modules: []
25-
operating_system: ubuntu18.04
25+
operating_system: ubuntu20.04
2626
paths:
27-
cc: /usr/lib/llvm-6.0/bin/clang
28-
cxx: /usr/lib/llvm-6.0/bin/clang++
27+
cc: /usr/bin/clang-7
28+
cxx: /usr/bin/clang++-7
2929
f77: null
3030
fc: null
31-
spec: clang@6.0.0
31+
spec: clang@7.0.1
3232
target: x86_64
3333

3434
config:

.github/ci/spack-envs/clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp/spack.yaml renamed to .github/ci/spack-envs/clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp/spack.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spack:
4141
variants: ~fortran
4242
providers:
4343
mpi: [openmpi]
44-
compiler: [clang@6.0.0]
44+
compiler: [clang@7.0.1]
4545

4646
compilers:
4747
- compiler:
@@ -51,13 +51,13 @@ spack:
5151
cxxflags: -stdlib=libc++
5252
ldflags: -stdlib=libc++
5353
modules: []
54-
operating_system: ubuntu18.04
54+
operating_system: ubuntu20.04
5555
paths:
56-
cc: /usr/lib/llvm-6.0/bin/clang
57-
cxx: /usr/lib/llvm-6.0/bin/clang++
56+
cc: /usr/bin/clang-7
57+
cxx: /usr/bin/clang++-7
5858
f77: /usr/bin/gfortran
5959
fc: /usr/bin/gfortran
60-
spec: clang@6.0.0
60+
spec: clang@7.0.1
6161
target: x86_64
6262

6363
config:

.github/ci/spack-envs/gcc7_py36_ompi_h5_ad1_ad2/spack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spack:
4747
extra_rpaths: []
4848
flags: {}
4949
modules: []
50-
operating_system: ubuntu18.04
50+
operating_system: ubuntu20.04
5151
paths:
5252
cc: /usr/bin/gcc-7
5353
cxx: /usr/bin/g++-7

.github/workflows/linux.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ concurrency:
77
cancel-in-progress: true
88

99
jobs:
10-
clang6_nopy_nompi_h5_libcpp:
11-
runs-on: ubuntu-18.04
10+
clang7_nopy_nompi_h5_libcpp:
11+
runs-on: ubuntu-20.04
1212
if: github.event.pull_request.draft == false
1313
steps:
1414
- uses: actions/checkout@v3
1515
- name: Spack Cache
1616
uses: actions/cache@v3
17-
with: {path: /opt/spack, key: clang6_nopy_nompi_h5_libcpp_v2 }
17+
with: {path: /opt/spack, key: clang7_nopy_nompi_h5_libcpp_v2}
1818
- name: Install
1919
run: |
2020
sudo apt-get update
21-
sudo apt-get install clang-6.0 libc++-dev libc++abi-dev
21+
sudo apt-get install clang-7 libc++-7-dev libc++abi-7-dev
2222
sudo .github/workflows/dependencies/install_spack
2323
- name: Build
24-
env: {CC: clang-6.0, CXX: clang++-6.0, CXXFLAGS: -stdlib=libc++ -Werror -Wno-ignored-attributes -Wno-unused-const-variable}
24+
env: {CC: clang-7, CXX: clang++-7, CXXFLAGS: -stdlib=libc++ -Werror -Wno-ignored-attributes -Wno-unused-const-variable}
2525
# -Wno-ignored-attributes -Wno-unused-const-variable: clang-6 has a
2626
# false positive on src/auxiliary/Filesystem.cpp
2727
# [[maybe_unused]] MPI_Datatype const MPI_Types< unsigned >::value = MPI_UNSIGNED;
2828
run: |
29-
eval $(spack env activate --sh .github/ci/spack-envs/clang6_nopy_nompi_h5_libcpp/)
29+
eval $(spack env activate --sh .github/ci/spack-envs/clang7_nopy_nompi_h5_libcpp/)
3030
spack install
3131
3232
share/openPMD/download_samples.sh build
@@ -39,21 +39,21 @@ jobs:
3939
cmake --build build --parallel 2
4040
ctest --test-dir build --output-on-failure
4141
42-
clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp:
43-
runs-on: ubuntu-18.04
42+
clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp:
43+
runs-on: ubuntu-20.04
4444
if: github.event.pull_request.draft == false
4545
steps:
4646
- uses: actions/checkout@v3
4747
- name: Spack Cache
4848
uses: actions/cache@v3
49-
with: {path: /opt/spack, key: clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp_v2 }
49+
with: {path: /opt/spack, key: clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp_v2}
5050
- name: Install
5151
run: |
5252
sudo apt-get update
53-
sudo apt-get install clang-6.0 libc++-dev libc++abi-dev gfortran libopenmpi-dev python3
53+
sudo apt-get install clang-7 libc++-7-dev libc++abi-7-dev gfortran libopenmpi-dev python3
5454
sudo .github/workflows/dependencies/install_spack
5555
- name: Build
56-
env: {CC: clang-6.0, CXX: clang++-6.0, CXXFLAGS: -stdlib=libc++ -Werror -Wno-ignored-attributes -Wno-unused-const-variable}
56+
env: {CC: clang-7, CXX: clang++-7, CXXFLAGS: -stdlib=libc++ -Werror -Wno-ignored-attributes -Wno-unused-const-variable}
5757
# -Wno-ignored-attributes -Wno-unused-const-variable: clang-6 has a
5858
# false positive on src/auxiliary/Filesystem.cpp
5959
# [[maybe_unused]] MPI_Datatype const MPI_Types< unsigned >::value = MPI_UNSIGNED;
@@ -62,7 +62,7 @@ jobs:
6262
mpiexec --version
6363
perl --version
6464
python --version
65-
eval $(spack env activate --sh .github/ci/spack-envs/clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp/)
65+
eval $(spack env activate --sh .github/ci/spack-envs/clang7_nopy_ompi_h5_ad1_ad2_bp3_libcpp/)
6666
spack install
6767
6868
share/openPMD/download_samples.sh build
@@ -202,7 +202,7 @@ jobs:
202202
# gcc-7.4.0_py_ompi_h5_ad1_ad2_coveralls
203203

204204
gcc7_py36_pd_dd_ompi_h5_ad1_ad2:
205-
runs-on: ubuntu-18.04
205+
runs-on: ubuntu-20.04
206206
if: github.event.pull_request.draft == false
207207
steps:
208208
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)