diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2022-10-05 13:44:54 -0500 |
|---|---|---|
| committer | Patrick Griffis <pgriffis@igalia.com> | 2022-10-05 13:44:54 -0500 |
| commit | 210c37767aec4557593dd23653f4ad6a7991ef63 (patch) | |
| tree | b7e435cc2be1881434975c912196c66518cbbe69 | |
| parent | d86d346450476e7f4b7d5af79d6808d13b29e292 (diff) | |
| download | libsoup-210c37767aec4557593dd23653f4ad6a7991ef63.tar.gz | |
ci: Update libnghttp2 to 1.50.0
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 12 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c0feb28..48cb08a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/libsoup/master:v16 +image: registry.gitlab.gnome.org/gnome/libsoup/master:v17 stages: - build diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 394123e9..1a735977 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -29,7 +29,7 @@ RUN dnf update -y \ vala \ valgrind \ which \ - && dnf builddep -y glib2 vala \ + && dnf builddep -y glib2 nghttp2 vala \ && dnf clean all \ && python2.7 -m ensurepip \ && pip2.7 install virtualenv autobahntestsuite \ @@ -71,6 +71,16 @@ RUN git clone https://gitlab.gnome.org/GNOME/libsoup.git \ && popd \ && rm -rf libsoup +# Update libnghttp2 for do_invalid_header_rfc9113_received_test() +RUN git clone https://github.com/nghttp2/nghttp2.git \ + && pushd nghttp2 \ + && git checkout v1.50.0 \ + && autoreconf --install --symlink \ + && ./configure --prefix=/usr --disable-static --disable-examples \ + && make -j $(nproc) install \ + && popd \ + && rm -rf nghttp2 + ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} RUN useradd -u $HOST_USER_ID -ms /bin/bash user diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index f92dddab..e06091f6 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:v16" +TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v17" SUDO_CMD="sudo" if docker -v |& grep -q podman; then |