diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2018-06-07 17:23:26 +0000 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2018-06-07 17:23:26 +0000 |
| commit | caf68ed87b4ad176eaae62532ed37c8f15d6466a (patch) | |
| tree | aa60536de97fe345c30a05298e7ced930131fd19 | |
| parent | 11a8fd6b872cd6a888180d83d9728435a4f95c9e (diff) | |
| parent | 7016aedde88c539c0eda689c2852170c9ce96b37 (diff) | |
| download | glib-1409-drop-glib-zip-in.tar.gz | |
Merge branch 'fam-ci' into 'master'1409-drop-glib-zip-in
Fam ci
See merge request GNOME/glib!78
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20d6c3696..8a3dca782 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ fedora-meson-x86_64: variables: CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" script: - - meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build . + - meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true -Dfam=true _build . - ninja -C _build - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} - mkdir -p _coverage diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 56585d8a1..cdb54eb16 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -4,6 +4,7 @@ RUN dnf -y install \ desktop-file-utils \ elfutils-libelf-devel \ findutils \ + gamin-devel \ gcc \ gcc-c++ \ gettext \ @@ -18,21 +19,21 @@ RUN dnf -y install \ libmount-devel \ libselinux-devel \ libxslt \ + make \ + mingw64-gcc \ + mingw64-gcc-c++ \ + mingw64-gettext \ + mingw64-libffi \ + mingw64-zlib \ ninja-build \ pcre-devel \ python3 \ python3-pip \ python3-wheel \ systemtap-sdt-devel \ - zlib-devel \ - wget \ unzip \ - make \ - mingw64-gcc \ - mingw64-gcc-c++ \ - mingw64-gettext \ - mingw64-zlib \ - mingw64-libffi \ + wget \ + zlib-devel \ && dnf clean all RUN pip3 install meson |