[482d9673cfee5de391f97fde4d1c84f9f8d6f2cf0784fcffb958b4032de7236c] CI: Build sysprof from source in debug image



commit df83e380b1265ece4f780bc4036ab2cbc94b4e3b
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Jul 5 15:43:44 2020 -0700

    CI: Build sysprof from source in debug image
    
    We need sysprof-capture-4 which has not been released yet. So we need to
    build it ourselves. Build it only in the debug image, at least until it
    is packaged on Fedora.

 test/extra/Dockerfile       |  4 ++--
 test/extra/Dockerfile.debug | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index b92bfdd1..eb4ceb41 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -42,8 +42,8 @@ RUN dnf -y install --enablerepo=fedora-debuginfo,updates-debuginfo \
     gobject-introspection-debuginfo gobject-introspection-debugsource \
     gobject-introspection-devel gtk3-debuginfo gtk3-debugsource gtk3-devel \
     gtk4-debuginfo gtk4-debugsource gtk4-devel lcov libasan libubsan libtsan \
-    meson ninja-build pkgconf readline-devel sysprof-devel systemtap-sdt-devel \
-    valgrind which Xvfb xz && \
+    meson ninja-build pkgconf readline-devel systemtap-sdt-devel valgrind \
+    which Xvfb xz && \
     dnf clean all && rm -rf /var/cache/dnf
 
 COPY --from=mozjs-build /root/mozjs-install/usr /usr
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index fd3dd6b6..231fccd8 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -8,7 +8,7 @@ ENV SHELL=/bin/bash
 
 RUN dnf -y install 'dnf-command(builddep)' clang-devel cmake git llvm-devel \
     make ninja-build which
-RUN dnf -y builddep mozjs68
+RUN dnf -y builddep mozjs68 sysprof
 
 WORKDIR /root
 
@@ -24,6 +24,18 @@ RUN DESTDIR=/root/iwyu-install ninja install
 
 WORKDIR /root
 
+RUN git clone --depth 1 https://gitlab.gnome.org/GNOME/sysprof.git
+
+WORKDIR /root/sysprof
+
+RUN meson _build -Dprefix=/usr -Dlibdir=lib64 -Denable_examples=false \
+    -Denable_gtk=false -Denable_tests=false -Denable_tools=false -Dhelp=false \
+    -Dlibsysprof=false -Dwith_sysprofd=none
+RUN ninja -C _build
+RUN DESTDIR=/root/sysprof-install ninja -C _build install
+
+WORKDIR /root
+
 RUN git clone --depth 1 https://github.com/ptomato/mozjs.git -b ${MOZJS_BRANCH}
 RUN mkdir -p mozjs/_build
 
@@ -56,11 +68,12 @@ RUN dnf -y install --enablerepo=fedora-debuginfo,updates-debuginfo \
     gobject-introspection-debuginfo gobject-introspection-debugsource \
     gobject-introspection-devel gtk3-debuginfo gtk3-debugsource gtk3-devel \
     gtk4-debuginfo gtk4-debugsource gtk4-devel lcov libasan libubsan libtsan \
-    meson ninja-build pkgconf readline-devel sysprof-devel systemtap-sdt-devel \
-    valgrind which Xvfb xz && \
+    meson ninja-build pkgconf readline-devel systemtap-sdt-devel valgrind \
+    which Xvfb xz && \
     dnf clean all && rm -rf /var/cache/dnf
 
 COPY --from=build /root/mozjs-install/usr /usr
+COPY --from=build /root/sysprof-install/usr /usr
 COPY --from=build /root/iwyu-install/usr /usr
 RUN ln -s /usr/bin/iwyu_tool.py /usr/bin/iwyu_tool
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]