diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2020-10-13 14:04:12 -0500 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2020-11-14 19:07:24 +0000 |
| commit | 0f471888b8ad4ab97283023109bcbde714f2ed48 (patch) | |
| tree | 5093d252c58ff25fdc9e1fba4f0004fb9043efd5 | |
| parent | 93003fce0e04f09fb405f982b0a2a91c1fd299b9 (diff) | |
| download | libsoup-0f471888b8ad4ab97283023109bcbde714f2ed48.tar.gz | |
ci: Build glib master
| -rw-r--r-- | .gitlab-ci/Dockerfile | 10 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 0e6b93ee..827187fe 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -2,7 +2,7 @@ FROM fedora:31 RUN dnf update -y \ && dnf install -y 'dnf-command(builddep)' \ - && dnf builddep -y libsoup \ + && dnf builddep -y libsoup glib2 \ && dnf install -y brotli-devel \ git \ gtk-doc \ @@ -16,7 +16,13 @@ RUN dnf update -y \ redhat-rpm-config \ samba-winbind-clients \ which \ - && dnf clean all + && dnf clean all \ + && git clone https://gitlab.gnome.org/GNOME/glib.git \ + && pushd glib \ + && meson _build --prefix=/usr \ + && meson install -C _build \ + && popd \ + && rm -rf glib ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 7e89d388..486a7a43 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v5" +TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v6" cd "$(dirname "$0")" podman build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" --format=docker . |