[libsoup/wip/soup-uri-removal] ci: Build glib 2.66
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/soup-uri-removal] ci: Build glib 2.66
- Date: Tue, 13 Oct 2020 19:27:55 +0000 (UTC)
commit 974df611e0a3d95ee027eb11da85b9f438a9a9bd
Author: Patrick Griffis <pgriffis igalia com>
Date: Tue Oct 13 14:04:12 2020 -0500
ci: Build glib 2.66
.gitlab-ci.yml | 2 +-
.gitlab-ci/Dockerfile | 10 ++++++++--
.gitlab-ci/run-docker.sh | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e09c998..d600c730 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/libsoup/master:v5
+image: registry.gitlab.gnome.org/gnome/libsoup/master:v6
stages:
- build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 0e6b93ee..01189565 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 --depth=1 --branch=2.66.1 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 .
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]