summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorPatrick Griffis <pgriffis@igalia.com>2021-08-23 08:59:46 -0500
committerPatrick Griffis <pgriffis@igalia.com>2021-08-23 09:30:31 -0500
commit8f8839cb9fe665b6d06077c4fce0571bc139d6ba (patch)
tree2d8aef6e1704867d31d6feeab7c5bae659bac97f /.gitlab-ci
parent4c50b4eb713b85ecd50245c76692e6bcec2a2eef (diff)
downloadlibsoup-8f8839cb9fe665b6d06077c4fce0571bc139d6ba.tar.gz
Bump glib requirement to 2.69.1
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/Dockerfile4
-rwxr-xr-x.gitlab-ci/run-docker.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index bc4d4b4e..1b589497 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -36,7 +36,7 @@ RUN dnf update -y \
RUN git clone https://gitlab.gnome.org/GNOME/glib.git \
&& pushd glib \
- && git checkout 02742ef957b532789c003eef80ec7f51c370e3d5 \
+ && git checkout 2.69.1 \
&& meson _build --prefix=/usr \
&& ninja -C _build install \
&& popd \
@@ -44,7 +44,7 @@ RUN git clone https://gitlab.gnome.org/GNOME/glib.git \
RUN git clone https://gitlab.gnome.org/GNOME/glib-networking.git \
&& pushd glib-networking \
- && git checkout 2.70.alpha \
+ && git checkout f7b3250d3e3fce4ea02b00610d9f2148ade4a6ce \
&& meson _build --prefix=/usr \
&& ninja -C _build install \
&& popd \
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index e386d021..f23c8151 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:v13"
+TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v14"
SUDO_CMD="sudo"
if docker -v |& grep -q podman; then