From a933a3dd42ba9b7b0ef2c0e2335a02f6ba12832f Mon Sep 17 00:00:00 2001
From: Rich Hornung <hornung1@llnl.gov>
Date: Tue, 16 Jul 2024 15:44:30 -0700
Subject: [PATCH] Rework gcc builds for GitHub Actions; turn off on azure

---
 .github/workflows/build.yml |  5 ++++-
 Dockerfile                  | 21 ++++++---------------
 azure-pipelines.yml         | 16 ++++++++--------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 12c8dde7eb..fdca11a0ab 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,10 @@ jobs:
   build_docker:
     strategy:
       matrix:
-        target: [gcc, clang, hip, cuda, sycl]
+        gcc12:
+          docker_target: gcc12
+        gcc13:
+          docker_target: gcc13
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
diff --git a/Dockerfile b/Dockerfile
index 5c2d8c633d..56ffeb0b28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,30 +5,21 @@
 # SPDX-License-Identifier: (BSD-3-Clause)
 ###############################################################################
 
-FROM ghcr.io/rse-ops/gcc-ubuntu-20.04:gcc-8.1.0 AS gcc8.1.0
+FROM ghcr.io/llnl/radiuss:ubuntu-22.04-gcc-12 AS gcc12
 ENV GTEST_COLOR=1
 COPY . /home/raja/workspace
 WORKDIR /home/raja/workspace/build
-RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_COVERAGE=On -DENABLE_OPENMP=On .. && \
-    make -j 6 &&\
+RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On .. && \
+    make -j 8 &&\
     ctest -T test --output-on-failure && \
     cd .. && rm -rf build
 
-FROM ghcr.io/rse-ops/gcc-ubuntu-20.04:gcc-9.4.0 AS gcc9.4.0
+FROM ghcr.io/llnl/radiuss:ubuntu-22.04-gcc-13 AS gcc13
 ENV GTEST_COLOR=1
 COPY . /home/raja/workspace
 WORKDIR /home/raja/workspace/build
-RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_RUNTIME_PLUGINS=On -DENABLE_OPENMP=On .. && \
-    make -j 6 &&\
-    ctest -T test --output-on-failure && \
-    cd .. && rm -rf build
-
-FROM ghcr.io/rse-ops/gcc-ubuntu-20.04:gcc-11.2.0 AS gcc11.2.0
-ENV GTEST_COLOR=1
-COPY . /home/raja/workspace
-WORKDIR /home/raja/workspace/build
-RUN cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_BOUNDS_CHECK=ON -DENABLE_OPENMP=On .. && \
-    make -j 6 &&\
+RUN cmake -DCMAKE_CXX_COMPILER=g++ -DRAJA_ENABLE_WARNINGS=On -DRAJA_ENABLE_WARNINGS_AS_ERRORS=On -DENABLE_OPENMP=On .. && \
+    make -j 8 &&\
     ctest -T test --output-on-failure && \
     cd .. && rm -rf build
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 33e3bfa8c0..1de13f250b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,14 +34,14 @@ jobs:
   timeoutInMinutes: 360
   strategy:
     matrix: 
-      gcc7.3.0:
-        docker_target: gcc7.3.0
-      gcc8.1.0:
-        docker_target: gcc8.1.0
-      gcc9.4.0:
-        docker_target: gcc9.4.0
-      gcc11.2.0:
-        docker_target: gcc11.2.0
+##      gcc7.3.0:
+##        docker_target: gcc7.3.0
+##      gcc8.1.0:
+##        docker_target: gcc8.1.0
+##      gcc9.4.0:
+##        docker_target: gcc9.4.0
+##      gcc11.2.0:
+##        docker_target: gcc11.2.0
       clang11.0.0:
         docker_target: clang11.0.0
       clang11.0.0-debug: