Add a Clang 7 build

openPMD · Jan 12, 2022 · e0f4593 · e0f4593
1 parent 4af8cb3
commit e0f4593
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 7 deletions.
diff --git a/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad1_ad2/spack.yaml b/.github/ci/spack-envs/clang7_nopy_ompi_h5_ad1_ad2/spack.yaml
@@ -0,0 +1,62 @@
+# This is a Spack environment file.
+#
+# Activating and installing this environment will provide all dependencies
+# that are needed for full-feature development.
+#   https//spack.readthedocs.io/en/latest/environments.html#anonymous-environments
+#
+spack:
+  specs:
+  - adios
+  - adios2
+  - hdf5
+  - openmpi
+
+  packages:
+    adios:
+      variants: ~zfp ~sz ~lz4 ~blosc
+    adios2:
+      variants: ~zfp ~sz ~png ~dataman ~python ~fortran ~ssc ~shared ~bzip2
+    cmake:
+      externals:
+      - spec: "cmake"
+        prefix: /usr
+      buildable: False
+    openmpi:
+      externals:
+      - spec: "openmpi"
+        prefix: /usr
+      buildable: False
+    perl:
+      externals:
+      - spec: "perl"
+        prefix: /usr
+      buildable: False
+    python:
+      externals:
+      - spec: "python"
+        prefix: /usr
+      buildable: False
+    all:
+      target: ['x86_64']
+      variants: ~fortran
+      providers:
+        mpi: [openmpi]
+      compiler: [clang@7.0.0]
+
+  compilers:
+  - compiler:
+      environment: {}
+      extra_rpaths: []
+      flags: {}
+      modules: []
+      operating_system: ubuntu20.04
+      paths:
+        cc: /usr/lib/llvm-7/bin/clang
+        cxx: /usr/lib/llvm-7/bin/clang++
+        f77: /usr/bin/gfortran
+        fc: /usr/bin/gfortran
+      spec: clang@7.0.0
+      target: x86_64
+
+  config:
+    build_jobs: 2
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Install
       run: |
         sudo apt-get update
-        sudo apt-get install clang-6.0
+        sudo apt-get install clang-6.0 libc++-7-dev
         sudo .github/workflows/dependencies/install_spack
     - name: Build
       env: {CC: clang-6.0, CXX: clang++-6.0, CXXFLAGS: -stdlib=libc++ -Werror -Wno-deprecated-declarations}
@@ -48,7 +48,7 @@ jobs:
     - name: Install
       run: |
         sudo apt-get update
-        sudo apt-get install clang-6.0 gfortran libopenmpi-dev python3
+        sudo apt-get install clang-6.0 libc++-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-deprecated-declarations}
@@ -74,23 +74,23 @@ jobs:
         export OPENPMD_BP_BACKEND=ADIOS1
         ctest --test-dir build --output-on-failure
 
-  clang6_nopy_ompi_h5_ad2_newLayout_libcpp:
+  clang7_nopy_ompi_h5_ad1_ad2_newLayout:
     runs-on: ubuntu-20.04
     if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v2
     - name: Spack Cache
       uses: actions/cache@v2
-      with: {path: /opt/spack, key: clang6_nopy_ompi_h5_ad1_ad2_bp3_libcpp }
+      with: {path: /opt/spack, key: clang7_nopy_ompi_h5_ad1_ad2 }
     - name: Install
       run: |
         sudo apt-get update
-        sudo apt-get install clang-6.0 gfortran libopenmpi-dev python3
+        sudo apt-get install clang-7 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-deprecated-declarations, OPENPMD2_ADIOS2_SCHEMA: 20210209}
+      env: {CC: clang-7, CXX: clang++-7, CXXFLAGS: -Werror -Wno-deprecated-declarations, OPENPMD2_ADIOS2_SCHEMA: 20210209}
       run: |
-        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/)
         spack install
 
         share/openPMD/download_samples.sh build