gplugin/builders

Move valgrind to fedora-31 as it's debug packages aren't garabage right now like debian's

2020-02-25, Gary Kramlich
bc37aa0a5687
Parents 83e46abdc0ef
Children a37f9d82c861
Move valgrind to fedora-31 as it's debug packages aren't garabage right now like debian's
2 files changed, 11 insertions(+), 18 deletions(-)
  • +9 -11
    Dockerfile.valgrind
  • +2 -7
    valgrind/build.sh
    • --- a/Dockerfile.valgrind Tue Feb 25 00:45:06 2020 -0600
    +++ b/Dockerfile.valgrind Tue Feb 25 01:14:35 2020 -0600
    @@ -1,18 +1,16 @@
    -FROM gplugin/builders:debian-bullseye-amd64
    +FROM gplugin/builders:fedora-31-amd64
    MAINTAINER Gary Kramlich <grim@reaperworld.com>
    RUN set -ex && \
    - echo deb http://debug.mirrors.debian.org/debian-debug/ bullseye-debug main > /etc/apt/sources.list.d/dbgsym.list && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - valgrind \
    - libglib2.0-0-dbgsym libgtk-3-0-dbgsym \
    - liblua5.3-0-dbg libpython3-dbg libgirepository-1.0-1-dbgsym \
    - libglib-perl-dbgsym libglib-object-introspection-perl-dbgsym \
    - && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    + dnf install -y valgrind dnf-plugins-core && \
    + dnf debuginfo-install -y \
    + glib2-devel gobject-introspection-devel \
    + gtk3-devel \
    + lua-devel lua-lgi lua-lpeg \
    + python3-devel pygobject3-devel python3-gobject \
    + perl-devel perl-ExtUtils-Embed perl-Glib perl-Glib-devel perl-Glib-Object-Introspection
    +COPY valgrind/valgrind-wrapper /usr/local/bin/
    COPY valgrind/build.sh /
    --- a/valgrind/build.sh Tue Feb 25 00:45:06 2020 -0600
    +++ b/valgrind/build.sh Tue Feb 25 01:14:35 2020 -0600
    @@ -20,19 +20,14 @@
    BUILD_DIR="build-valgrind"
    VALGRIND_COMMAND=<<EOF
    -valgrind
    - --suppressions=/usr/share/glib-2.0/valgrind/glib.supp
    - --leak-check=full
    - --error-exitcode=1
    - $@
    EOF
    meson ${BUILD_DIR}
    -meson test -C ${BUILD_DIR} --wrapper "${VARGRIND_COMMAND}"
    +meson test -C ${BUILD_DIR} --wrapper valgrind-wrapper
    EC=${?}
    mkdir -p ${CONVEY_WORKSPACE}/valgrind
    -cp -a ${BUILD_DIR}/meson-logs/testlog.txt ${CONVEY_WORKSPACE}/valgrind/
    +cp -a ${BUILD_DIR}/meson-logs/testlog-valgrind-wrapper.txt ${CONVEY_WORKSPACE}/valgrind/
    exit ${EC}