From 7bb2ca4a158ff1aec2e1b3998b9503474214d586 Mon Sep 17 00:00:00 2001
From: William F Godoy <williamfgc@yahoo.com>
Date: Fri, 16 Sep 2022 13:22:21 -0400
Subject: [PATCH] Upgrade to Clang15 and GCC9 on CI

Clang15 only on sulfur
---
 .../github-actions/ci/run_step.sh             | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/tests/test_automation/github-actions/ci/run_step.sh b/tests/test_automation/github-actions/ci/run_step.sh
index e3dacd6b3..c838f5b5d 100755
--- a/tests/test_automation/github-actions/ci/run_step.sh
+++ b/tests/test_automation/github-actions/ci/run_step.sh
@@ -80,10 +80,18 @@ case "$1" in
       ;;
     esac
 
-    # Path to QMC_DATA in self-hosted CI system
+    # Path to QMC_DATA in self-hosted CI system and point at minimum gcc-9
     if [[ "$HOST_NAME" =~ (sulfur) || "$HOST_NAME" =~ (nitrogen) ]]
     then
       QMC_DATA_DIR=/scratch/ci/QMC_DATA_FULL
+
+      # use gcc-9
+      export PATH=/opt/rh/gcc-toolset-9/root/bin:$PATH
+      export LD_LIBRARY_PATH=/opt/rh/gcc-toolset-9/root/usr/lib/gcc/x86_64-redhat-linux/9:$LD_LIBRARY_PATH
+      
+      # Make current environment variables available to subsequent steps
+      echo "PATH=/opt/rh/gcc-toolset-9/root/bin:$PATH" >> $GITHUB_ENV
+      echo "LD_LIBRARY_PATH=/opt/rh/gcc-toolset-9/root/usr/lib/gcc/x86_64-redhat-linux/9:$LD_LIBRARY_PATH" >> $GITHUB_ENV
     fi
     
     case "${GH_JOBNAME}" in
@@ -167,15 +175,15 @@ case "$1" in
               "with latest llvm, need built-from-source OpenBLAS due to bug in rpm"
 
         # todo: update to llvm 15 release, currently using release candidate
-        export OMPI_CC=/opt/llvm/15.0.0-rc3/bin/clang
-        export OMPI_CXX=/opt/llvm/15.0.0-rc3/bin/clang++
+        export OMPI_CC=/opt/llvm/15.0.0/bin/clang
+        export OMPI_CXX=/opt/llvm/15.0.0/bin/clang++
         
         # Make current environment variables available to subsequent steps
-        echo "OMPI_CC=/opt/llvm/15.0.0-rc3/bin/clang" >> $GITHUB_ENV
-        echo "OMPI_CXX=/opt/llvm/15.0.0-rc3/bin/clang++" >> $GITHUB_ENV
+        echo "OMPI_CC=/opt/llvm/15.0.0/bin/clang" >> $GITHUB_ENV
+        echo "OMPI_CXX=/opt/llvm/15.0.0/bin/clang++" >> $GITHUB_ENV
 
         # Confirm that cuda 11.2 gets picked up by the compiler
-        /opt/llvm/15.0.0-rc3/bin/clang++ -v
+        /opt/llvm/15.0.0/bin/clang++ -v
 
         cmake -GNinja \
               -DCMAKE_C_COMPILER=/usr/lib64/openmpi/bin/mpicc \
@@ -375,7 +383,7 @@ case "$1" in
 
     if [[ "${GH_JOBNAME}" =~ (AFQMC-Offload) ]]
     then
-       export LD_LIBRARY_PATH=/opt/llvm/15.0.0-rc3/lib:/usr/lib64/openmpi/lib:${LD_LIBRARY_PATH}
+       export LD_LIBRARY_PATH=/opt/llvm/15.0.0/lib:/usr/lib64/openmpi/lib:${LD_LIBRARY_PATH}
     fi
 
     if [[ "${GH_JOBNAME}" =~ (Intel19) ]]