From ba3b7b392df5ed007c77892106c53b696d02de8e Mon Sep 17 00:00:00 2001
From: Rich Hornung <hornung1@llnl.gov>
Date: Wed, 17 Jul 2024 11:02:03 -0700
Subject: [PATCH] Remove clang 14, try clang 15

---
 .github/workflows/build.yml |  2 +-
 Dockerfile                  | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5529fc84f6..95f16b3c12 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ jobs:
   build_docker:
     strategy:
       matrix:
-        target: [gcc12, gcc13, clang14_debug]
+        target: [gcc12, gcc13, clang15]
     runs-on: ubuntu-latest
     steps:
     - run: |
diff --git a/Dockerfile b/Dockerfile
index f41a236a6d..493cbd1cb9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,15 +21,15 @@ RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNI
     make -j 6 &&\
     ctest -T test --output-on-failure
 
-FROM ghcr.io/llnl/radiuss:ubuntu-22.04-clang-14 AS clang14_debug
-ENV GTEST_COLOR=1
-COPY . /home/raja/workspace
-WORKDIR /home/raja/workspace/build
-RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On -DCMAKE_BUILD_TYPE=Debug .. && \
-    make -j 6 &&\
-    ctest -T test --output-on-failure
+#FROM ghcr.io/llnl/radiuss:ubuntu-22.04-clang-14 AS clang14_debug
+#ENV GTEST_COLOR=1
+#COPY . /home/raja/workspace
+#WORKDIR /home/raja/workspace/build
+#RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On -DCMAKE_BUILD_TYPE=Debug .. && \
+#    make -j 6 &&\
+#    ctest -T test --output-on-failure
 
-#FROM ghcr.io/llnl/radiuss:ubuntu-22.04-clang-15 AS clang15
+#FROM ghcr.io/llnl/radiuss:ubuntu-22.04-clang-14 AS clang14
 #ENV GTEST_COLOR=1
 #COPY . /home/raja/workspace
 #WORKDIR /home/raja/workspace/build
@@ -37,6 +37,14 @@ RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On -DCMAKE_BUILD_TYPE=Deb
 #    make -j 6 &&\
 #    ctest -T test --output-on-failure
 
+FROM ghcr.io/llnl/radiuss:ubuntu-22.04-clang-15 AS clang15
+ENV GTEST_COLOR=1
+COPY . /home/raja/workspace
+WORKDIR /home/raja/workspace/build
+RUN cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On .. && \
+    make -j 6 &&\
+    ctest -T test --output-on-failure
+
 ##FROM ghcr.io/rse-ops/cuda:cuda-10.1.243-ubuntu-18.04 AS nvcc10.1.243
 ##ENV GTEST_COLOR=1
 ##COPY . /home/raja/workspace