update run script to account for updated clang

williamfgc · Apr 28, 2023 · 1eaab80 · 1eaab80
1 parent d5ffd84
commit 1eaab80
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci-github-actions.yaml b/.github/workflows/ci-github-actions.yaml
@@ -35,7 +35,7 @@ jobs:
             Clang10-NoMPI-ASan-Real,
             Clang10-NoMPI-ASan-Complex,
             Clang10-NoMPI-UBSan-Real,
-            Clang12-NoMPI-Offload-Real,
+            Clang16-NoMPI-Offload-Real,
           ]
         include:
           - jobname: GCC9-NoMPI-Debug-Real
@@ -103,7 +103,7 @@ jobs:
               image: walshmm/qmcpack-ci:ubuntu22-openmpi
               options: -u 1001
 
-          - jobname: Clang12-NoMPI-Offload-Real
+          - jobname: Clang16-NoMPI-Offload-Real
             container:
               image: walshmm/qmcpack-ci:ubuntu22-clang-latest
               options: -u 1001

diff --git a/tests/test_automation/github-actions/ci/run_step.sh b/tests/test_automation/github-actions/ci/run_step.sh
@@ -177,11 +177,11 @@ case "$1" in
               -DCMAKE_BUILD_TYPE=RelWithDebInfo \
               ${GITHUB_WORKSPACE}
       ;;
-      *"Clang12-NoMPI-Offload-Real"*)
-        echo 'Configure for building OpenMP offload with clang12 on x86_64 target'
+      *"Clang16-NoMPI-Offload-Real"*)
+        echo 'Configure for building OpenMP offload with clang16 on x86_64 target'
         cmake -GNinja \
-              -DCMAKE_C_COMPILER=clang-12 \
-              -DCMAKE_CXX_COMPILER=clang++-12 \
+              -DCMAKE_C_COMPILER=clang-16 \
+              -DCMAKE_CXX_COMPILER=clang++-16 \
               -DQMC_MPI=0 \
               -DENABLE_OFFLOAD=ON \
               -DOFFLOAD_TARGET=x86_64-pc-linux-gnu \
@@ -327,7 +327,7 @@ case "$1" in
       fi
     fi 
 
-    if [[ "${GH_JOBNAME}" =~ (Clang12-NoMPI-Offload) ]]
+    if [[ "${GH_JOBNAME}" =~ (Clang16-NoMPI-Offload) ]]
     then
        echo "Adding /usr/lib/llvm-12/lib/ to LD_LIBRARY_PATH to enable libomptarget.so"
        export LD_LIBRARY_PATH=/usr/lib/llvm-12/lib/:${LD_LIBRARY_PATH}