[gjs: 6/18] CI: Install sysprof from package instead of building it
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 6/18] CI: Install sysprof from package instead of building it
- Date: Fri, 4 Dec 2020 01:18:23 +0000 (UTC)
commit 8c24c0c1b7c87e1da098f4b551e79b01c1d7ab00
Author: Philip Chimento <philip chimento gmail com>
Date: Tue Nov 24 21:29:21 2020 -0800
CI: Install sysprof from package instead of building it
Now that we've upgraded to Fedora 33, we can avoid building sysprof
ourselves and just use the distro package.
test/extra/Dockerfile.debug | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index 0ace1e10..62bb6036 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -12,7 +12,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 ${MOZJS_BUILDDEPS} sysprof
+RUN dnf -y builddep ${MOZJS_BUILDDEPS}
WORKDIR /root
@@ -29,18 +29,6 @@ RUN DESTDIR=/root/iwyu-install ninja install
WORKDIR /root
-RUN git clone --branch master --no-tags --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 --no-tags --depth 1 https://github.com/ptomato/mozjs.git -b ${MOZJS_BRANCH}
RUN mkdir -p mozjs/_build
@@ -72,12 +60,11 @@ 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 systemtap-sdt-devel valgrind \
- which Xvfb xz && \
+ meson ninja-build pkgconf readline-devel sysprof-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]