diff options
| author | Ondrej Holy <oholy@redhat.com> | 2018-07-25 10:45:46 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2018-07-25 10:48:04 +0200 |
| commit | c340056a010182aa6c0f082fd0500105f6415d65 (patch) | |
| tree | 53c351704f152f27af7bfdd60739e68534650a8c | |
| parent | 8e1ec537b3bcebdde8e6e6703eb35c097b026461 (diff) | |
| download | gvfs-wip/oholy/ci-glib-update.tar.gz | |
ci: Update GLib in docker imagewip/oholy/ci-glib-update
Rebuild the docker image with newer GLib release to prevent CI failures
after commit 9f3ebeb869590fd5c14b47b871614c2c0a61da3e.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 5 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdb72981..fb683608 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/gvfs/master:v1 +image: registry.gitlab.gnome.org/gnome/gvfs/master:v2 build: stage: build diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index ce6c40ac..ee6efd20 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -3,10 +3,11 @@ FROM fedora:rawhide RUN dnf install -y avahi-devel avahi-glib-devel dbus-glib-devel docbook-style-xsl fuse-devel gcc gcr-devel gettext-devel glib2-devel gnome-online-accounts-devel libarchive-devel libbluray-devel libcap-devel libcdio-paranoia-devel libexif-devel libgcrypt-devel libgdata-devel libgphoto2-devel libgudev-devel libimobiledevice-devel libmtp-devel libnfs-devel libplist-devel libsecret-devel libsmbclient-devel libsoup-devel libtalloc-devel libudisks2-devel libusb-devel libxslt-devel meson openssh-clients pkgconf-pkg-config polkit-devel systemd-devel \ && dnf clean all -RUN dnf install -y elfutils-libelf-devel gamin-devel gcc gcc-c++ gettext git glibc-devel glibc-headers gtk-doc libattr-devel libffi-devel libmount-devel libselinux-devel ninja-build pcre-devel python3-devel systemtap-sdt-devel zlib-devel \ +RUN dnf install -y --best elfutils-libelf-devel gamin-devel gcc gcc-c++ gdbm gettext git glibc-devel glibc-headers gtk-doc libattr-devel libffi-devel libmount-devel libselinux-devel ninja-build pcre-devel python3-devel systemtap-sdt-devel zlib-devel \ && dnf clean all \ - && git clone --depth 1 https://gitlab.gnome.org/GNOME/glib.git \ + && git clone https://gitlab.gnome.org/GNOME/glib.git \ && cd glib \ + && git checkout a48692300194470f7b77ee0767a9104380d1c83c \ && meson . _build --prefix=/usr \ && ninja -C _build \ && ninja -C _build install \ diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 61ba9c6b..0530ce96 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,7 +2,7 @@ set -ve -TAG="registry.gitlab.gnome.org/gnome/gvfs/master:v1" +TAG="registry.gitlab.gnome.org/gnome/gvfs/master:v2" docker build -t $TAG . |