Try a different clang 15 image

LLNL · Jul 17, 2024 · 4b6634b · 4b6634b
1 parent aaa7e82
commit 4b6634b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ jobs:
   build_docker:
     strategy:
       matrix:
-        target: [gcc12, gcc13, clang14]
+        target: [gcc12, gcc13, clang15]
     runs-on: ubuntu-latest
     steps:
     - run: |

diff --git a/Dockerfile b/Dockerfile
@@ -29,15 +29,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:clang-14-ubuntu-22.04 AS clang14
-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/llnl/radiuss:clang-14-ubuntu-22.04 AS clang14
+#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/llnl/radiuss:ubuntu-22.04-clang-15 AS clang15
+FROM ghcr.io/llnl/radiuss:clang-15-ubuntu-22.04 AS clang15
 ENV GTEST_COLOR=1
 COPY . /home/raja/workspace
 WORKDIR /home/raja/workspace/build