Skip to content

Commit

Permalink
Merge pull request #76 from aurora-multiphysics/nmnobre/codecov
Browse files Browse the repository at this point in the history
Fix incorrect coverage reporting due to skipped tests
  • Loading branch information
alexanderianblair authored Jan 15, 2025
2 parents 2de76d6 + c5ace62 commit 10119b2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docker/platypus-deps/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# hadolint global ignore=DL3008,DL3013

# Get base image
FROM ubuntu:22.04
FROM ubuntu:24.04

# This is needed or it mpiexec complains because docker runs as root
# Discussion on this issue https://github.com/open-mpi/ompi/issues/4451
Expand Down Expand Up @@ -33,7 +33,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
python3-deepdiff \
python3-jinja2 \
python3-livereload \
python3-packaging \
python3-pybtex \
python3-pylatexenc \
python3-xmltodict \
Expand All @@ -45,6 +44,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
libhdf5-openmpi-dev \
libnetcdf-dev \
libsdl2-dev \
libtirpc-dev \
rsync \
xxd && \
rm -rf /var/lib/apt/lists/*
Expand Down
7 changes: 3 additions & 4 deletions docker/platypus/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,18 @@ RUN make -j$compile_cores coverage=$coverage

# Build Platypus docs
WORKDIR /$WORKDIR/platypus
RUN make -j$compile_cores
RUN doxygen doc/content/doxygen/Doxyfile
WORKDIR /$WORKDIR/platypus/doc
RUN ./moosedocs.py build

# Test Platypus regression tests
WORKDIR /$WORKDIR/platypus
RUN make test linkcoverage=$coverage
RUN make test

# Build Platypus unit tests
WORKDIR /$WORKDIR/platypus/unit
RUN make -j$compile_cores coverage=$coverage
RUN make -j$compile_cores

# Test Platypus unit tests
WORKDIR /$WORKDIR/platypus/unit
RUN make test linkcoverage=$coverage
RUN make test

0 comments on commit 10119b2

Please sign in to comment.