Skip to content

Commit

Permalink
Rework gcc builds for GitHub Actions; turn off on azure
Browse files Browse the repository at this point in the history
  • Loading branch information
rhornung67 committed Jul 16, 2024
1 parent f200f58 commit a933a3d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 24 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 6 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit a933a3d

Please sign in to comment.