Skip to content

Commit 8473f6b

Browse files
committed
CI: Clang 10->12
Update the Clang 10 build to Clang 12 in CI.
1 parent d13c9c8 commit 8473f6b

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

.github/ci/spack-envs/clang10_nopy_ompi_h5_ad1_ad2/spack.yaml renamed to .github/ci/spack-envs/clang12_py38_nompi_h5_ad1_ad2/spack.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,14 @@ spack:
1515
hdf5:
1616
variants: ~mpi
1717
adios:
18-
variants: ~zfp ~sz ~lz4 ~blosc
18+
variants: ~mpi ~zfp ~sz ~lz4 ~blosc
1919
adios2:
20-
variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
20+
variants: ~mpi ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
2121
cmake:
2222
externals:
2323
- spec: "cmake"
2424
prefix: /usr
2525
buildable: False
26-
openmpi:
27-
externals:
28-
- spec: "openmpi"
29-
prefix: /usr
30-
buildable: False
3126
perl:
3227
externals:
3328
- spec: "perl"
@@ -43,7 +38,7 @@ spack:
4338
variants: ~fortran
4439
providers:
4540
mpi: [openmpi]
46-
compiler: [clang@10.0.0]
41+
compiler: [clang@12.0.0]
4742

4843
compilers:
4944
- compiler:
@@ -53,11 +48,11 @@ spack:
5348
modules: []
5449
operating_system: ubuntu20.04
5550
paths:
56-
cc: /usr/lib/llvm-10/bin/clang
57-
cxx: /usr/lib/llvm-10/bin/clang++
51+
cc: /usr/lib/llvm-12/bin/clang
52+
cxx: /usr/lib/llvm-12/bin/clang++
5853
f77: /usr/bin/gfortran
5954
fc: /usr/bin/gfortran
60-
spec: clang@10.0.0
55+
spec: clang@12.0.0
6156
target: x86_64
6257

6358
config:

.github/workflows/linux.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,29 +106,33 @@ jobs:
106106
# TODO
107107
# clang6_py36_nompi_h5_ad1_ad2_libcpp
108108

109-
clang10_py38_nompi_h5_ad1_ad2_libcpp:
109+
clang12_py38_nompi_h5_ad1_ad2:
110110
runs-on: ubuntu-20.04
111111
if: github.event.pull_request.draft == false
112112
steps:
113113
- uses: actions/checkout@v2
114+
- name: Spack Cache
115+
uses: actions/cache@v2
116+
with: {path: /opt/spack, key: clang12_py38_nompi_h5_ad1_ad2 }
114117
- name: Install
115118
run: |
116119
sudo apt-get update
117-
sudo apt-get install clang-10 libc++-dev libc++abi-dev libhdf5-dev python3
118-
python3 -m pip install -U pip
119-
python3 -m pip install -U numpy
120-
# TODO ADIOS1 ADIOS2
120+
sudo apt-get install clang-12 libhdf5-dev python3 python3-pip python3-numpy python3-pandas
121+
sudo .github/workflows/dependencies/install_spack
121122
- name: Build
122-
env: {CC: clang-10, CXX: clang++-10, CXXFLAGS: -Werror -Wno-deprecated-declarations}
123-
# TODO
124-
# , CXXFLAGS: -nostdinc++ -I/usr/include/c++/10 -I/usr/include/x86_64-linux-gnu/c++/10/, LDFLAGS: -stdlib=libc++ -lc++ -lc++abi}
123+
env: {CC: clang-12, CXX: clang++-12, CXXFLAGS: -Werror -Wno-deprecated-declarations}
125124
run: |
125+
eval $(spack env activate --sh .github/ci/spack-envs/clang12_py38_nompi_h5_ad1_ad2/)
126+
spack install
127+
126128
share/openPMD/download_samples.sh build
127129
chmod u-w build/samples/git-sample/*.h5
128130
cmake -S . -B build \
129131
-DopenPMD_USE_PYTHON=ON \
130132
-DopenPMD_USE_MPI=OFF \
131133
-DopenPMD_USE_HDF5=ON \
134+
-DopenPMD_USE_ADIOS1=ON \
135+
-DopenPMD_USE_ADIOS2=ON \
132136
-DopenPMD_USE_INVASIVE_TESTS=ON \
133137
-DCMAKE_VERBOSE_MAKEFILE=ON
134138
cmake --build build --parallel 2

0 commit comments

Comments
 (0)