Skip to content

Commit

Permalink
Fix Dockerfile and switch to GitHub Actions for clang testing
Browse files Browse the repository at this point in the history
  • Loading branch information
rhornung67 committed Jul 17, 2024
1 parent f69b14a commit fad25da
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
build_docker:
strategy:
matrix:
target: [gcc12, gcc13]
target: [gcc12, gcc13, clang13-debug, clang15]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
36 changes: 11 additions & 25 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,48 +10,34 @@ 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_OPENMP=On .. && \
make -j 8 &&\
ctest -T test --output-on-failure && \
cd .. && rm -rf build
make -j 12 &&\
ctest -T test --output-on-failure

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_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/clang-ubuntu-20.04:llvm-11.0.0 AS clang11.0.0
ENV GTEST_COLOR=1
COPY . /home/raja/workspace
WORKDIR /home/raja/workspace/build
RUN . /opt/spack/share/spack/setup-env.sh && export LD_LIBRARY_PATH=/opt/view/lib:$LD_LIBRARY_PATH && \
cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On .. && \
make -j 6 &&\
ctest -T test --output-on-failure && \
cd .. && rm -rf build
make -j 12 &&\
ctest -T test --output-on-failure

FROM ghcr.io/rse-ops/clang-ubuntu-20.04:llvm-11.0.0 AS clang11.0.0-debug
FROM ghcr.io/llnl/radiuss:clang-13-ubuntu-22.04 AS clang13-debug
ENV GTEST_COLOR=1
COPY . /home/raja/workspace
WORKDIR /home/raja/workspace/build
RUN . /opt/spack/share/spack/setup-env.sh && export LD_LIBRARY_PATH=/opt/view/lib:$LD_LIBRARY_PATH && \
cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On -DCMAKE_BUILD_TYPE=Debug .. && \
make -j 6 &&\
ctest -T test --output-on-failure && \
cd .. && rm -rf build
make -j 12 &&\
ctest -T test --output-on-failure

FROM ghcr.io/rse-ops/clang-ubuntu-22.04:llvm-13.0.0 AS clang13.0.0
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
RUN . /opt/spack/share/spack/setup-env.sh && export LD_LIBRARY_PATH=/opt/view/lib:$LD_LIBRARY_PATH && \
cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On -DCMAKE_BUILD_TYPE=Release .. && \
make -j 6 &&\
ctest -T test --output-on-failure && \
cd .. && rm -rf build
cmake -DCMAKE_CXX_COMPILER=clang++ -DENABLE_OPENMP=On .. && \
make -j 12 &&\
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
Expand Down
12 changes: 6 additions & 6 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ jobs:
## 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:
docker_target: clang11.0.0-debug
clang13.0.0:
docker_target: clang13.0.0
## clang11.0.0:
## docker_target: clang11.0.0
## clang11.0.0-debug:
## docker_target: clang11.0.0-debug
## clang13.0.0:
## docker_target: clang13.0.0
## nvcc10.1.243:
## docker_target: nvcc10.1.243
## nvcc11.1.1:
Expand Down

0 comments on commit fad25da

Please sign in to comment.