Upgrade CI to llvm-12

Signed-off-by: Nicolas Bock <[email protected]>
lanl · Jun 6, 2022 · c383526 · c383526
1 parent f9bc9f7
commit c383526
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 21 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -92,14 +92,14 @@ jobs:
             TEST_SCRIPT: ./scripts/ci-MPI-single-complex.sh
           - JOBNAME: MPI double complex
             TEST_SCRIPT: ./scripts/ci-MPI-double-complex.sh
-          - JOBNAME: clang-11 / gfortran-11 C single real
-            TEST_SCRIPT: ./scripts/ci-clang-11-gfortran-11-C-single-real.sh
-          - JOBNAME: clang-11 / gfortran-11 C double real
-            TEST_SCRIPT: ./scripts/ci-clang-11-gfortran-11-C-double-real.sh
-          - JOBNAME: clang-11 / gfortran-11 C single complex
-            TEST_SCRIPT: ./scripts/ci-clang-11-gfortran-11-C-single-complex.sh
-          - JOBNAME: clang-11 / gfortran-11 C double complex
-            TEST_SCRIPT: ./scripts/ci-clang-11-gfortran-11-C-double-complex.sh
+          - JOBNAME: clang-12 / gfortran-11 C single real
+            TEST_SCRIPT: ./scripts/ci-clang-12-gfortran-11-C-single-real.sh
+          - JOBNAME: clang-12 / gfortran-11 C double real
+            TEST_SCRIPT: ./scripts/ci-clang-12-gfortran-11-C-double-real.sh
+          - JOBNAME: clang-12 / gfortran-11 C single complex
+            TEST_SCRIPT: ./scripts/ci-clang-12-gfortran-11-C-single-complex.sh
+          - JOBNAME: clang-12 / gfortran-11 C double complex
+            TEST_SCRIPT: ./scripts/ci-clang-12-gfortran-11-C-double-complex.sh
     steps:
       - name: Check out sources
         uses: actions/checkout@v2

diff --git a/...-clang-11-gfortran-11-C-double-complex.sh → ...-clang-12-gfortran-11-C-double-complex.sh b/...-clang-11-gfortran-11-C-double-complex.sh → ...-clang-12-gfortran-11-C-double-complex.sh
@@ -4,9 +4,9 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-export CC=${CC:-clang-11}
-export CXX=${CXX:-clang++-11}
-export FC=${FC:-gfortran-9}
+export CC=${CC:-clang-12}
+export CXX=${CXX:-clang++-12}
+export FC=${FC:-gfortran-11}
 export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
 export BML_OPENMP=${BML_OPENMP:-no}
 export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}

diff --git a/.../ci-clang-11-gfortran-11-C-double-real.sh → .../ci-clang-12-gfortran-11-C-double-real.sh b/.../ci-clang-11-gfortran-11-C-double-real.sh → .../ci-clang-12-gfortran-11-C-double-real.sh
@@ -4,9 +4,9 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-export CC=${CC:-clang-11}
-export CXX=${CXX:-clang++-11}
-export FC=${FC:-gfortran-9}
+export CC=${CC:-clang-12}
+export CXX=${CXX:-clang++-12}
+export FC=${FC:-gfortran-11}
 export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
 export BML_OPENMP=${BML_OPENMP:-no}
 export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}

diff --git a/...-clang-11-gfortran-11-C-single-complex.sh → ...-clang-12-gfortran-11-C-single-complex.sh b/...-clang-11-gfortran-11-C-single-complex.sh → ...-clang-12-gfortran-11-C-single-complex.sh
@@ -4,9 +4,9 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-export CC=${CC:-clang-11}
-export CXX=${CXX:-clang++-11}
-export FC=${FC:-gfortran-9}
+export CC=${CC:-clang-12}
+export CXX=${CXX:-clang++-12}
+export FC=${FC:-gfortran-11}
 export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
 export BML_OPENMP=${BML_OPENMP:-no}
 export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}

diff --git a/.../ci-clang-11-gfortran-11-C-single-real.sh → .../ci-clang-12-gfortran-11-C-single-real.sh b/.../ci-clang-11-gfortran-11-C-single-real.sh → .../ci-clang-12-gfortran-11-C-single-real.sh
@@ -4,9 +4,9 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-export CC=${CC:-clang-11}
-export CXX=${CXX:-clang++-11}
-export FC=${FC:-gfortran-9}
+export CC=${CC:-clang-12}
+export CXX=${CXX:-clang++-12}
+export FC=${FC:-gfortran-11}
 export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
 export BML_OPENMP=${BML_OPENMP:-no}
 export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}

diff --git a/scripts/prepare-container.sh b/scripts/prepare-container.sh
@@ -24,6 +24,8 @@ deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main
 # 12
 deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main
 # deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main
+deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-13 main
+# deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-13 main
 EOF
 ${SUDO} bash -c "cat > /etc/apt/trusted.gpg.d/llvm.gpg" < <(wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor)
 
@@ -69,7 +71,7 @@ ${SUDO} apt-get install --assume-yes --no-install-recommends \
     bundler \
     cmake cmake-data \
     emacs27 \
-    clang-11 llvm-11-dev libomp-11-dev \
+    clang-12 llvm-12-dev libomp-12-dev \
     gcc-4.8 g++-4.8 gfortran-4.8 \
     gcc-9 g++-9 gfortran-9 \
     gcc-10 g++-10 gfortran-10 \