diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2021-08-03 12:18:59 -0500 |
|---|---|---|
| committer | Patrick Griffis <pgriffis@igalia.com> | 2021-09-16 12:10:48 -0500 |
| commit | a54017fe5808245faeb81d867f08509b0c757cad (patch) | |
| tree | 723b51cf63634a870ed0864e6ca19a5c3156a035 | |
| parent | 5317a69972b11a1727aa37ef3d55229e3f8dc032 (diff) | |
| download | libsoup-fix-docs.tar.gz | |
ci: Install glib and libsoup2 documentation for websitefix-docs
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 33 | ||||
| -rw-r--r-- | .gitlab-ci/index.html | 11 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 | ||||
| -rw-r--r-- | docs/reference/libsoup-3.0-docs.xml | 2 |
5 files changed, 43 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f2ca416..f24daf13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.gnome.org/gnome/libsoup/master:v14 +image: registry.gitlab.gnome.org/gnome/libsoup/master:v15 stages: - build @@ -87,12 +87,14 @@ reference: DESTDIR: _install needs: [] script: - - meson _build -Dgtk_doc=true + - meson _build --prefix=/usr -Dgtk_doc=true - ninja -C _build libsoup-3.0-doc - - ninja -C _build install - - mv _build/docs/reference/html/ _reference/ - .gitlab-ci/check-docs.py - - gtkdoc-rebase --html-dir=_reference/ --online + - mkdir -p _reference/libsoup-3.0 + - cp -R _build/docs/reference/html/* _reference/libsoup-3.0/ + - cp -R /usr/share/gtk-doc/html/{glib,gio,gobject,libsoup-2.4} _reference + - cp .gitlab-ci/index.html _reference + - gtkdoc-rebase --relative --html-dir=./_reference/ --verbose artifacts: paths: - _build/docs/reference/libsoup-3.0-*.txt diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 1b589497..a787bb48 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -2,6 +2,7 @@ FROM fedora:34 RUN dnf update -y \ && dnf install -y \ + autoconf-archive \ brotli-devel \ clang-analyzer \ 'dnf-command(builddep)' \ @@ -25,30 +26,42 @@ RUN dnf update -y \ samba-winbind-clients \ sqlite-devel \ sysprof-devel \ + vala \ valgrind \ which \ - && dnf builddep -y glib2 \ - && dnf install --releasever=35 -y vala \ + && dnf builddep -y glib2 vala \ && dnf clean all \ && python2.7 -m ensurepip \ && pip2.7 install virtualenv autobahntestsuite \ - && pip3 install quart - -RUN git clone https://gitlab.gnome.org/GNOME/glib.git \ + && pip3 install quart \ + && git clone https://gitlab.gnome.org/GNOME/glib.git \ && pushd glib \ && git checkout 2.69.1 \ - && meson _build --prefix=/usr \ + && meson _build --prefix=/usr -Dgtk_doc=true \ && ninja -C _build install \ && popd \ - && rm -rf glib - -RUN git clone https://gitlab.gnome.org/GNOME/glib-networking.git \ + && rm -rf glib \ + && git clone https://gitlab.gnome.org/GNOME/glib-networking.git \ && pushd glib-networking \ && git checkout f7b3250d3e3fce4ea02b00610d9f2148ade4a6ce \ && meson _build --prefix=/usr \ && ninja -C _build install \ && popd \ - && rm -rf glib-networking + && rm -rf glib-networking \ + && git clone https://gitlab.gnome.org/GNOME/vala.git \ + && pushd vala \ + && git checkout 0.50.10 \ + && ./autogen.sh --prefix=/usr \ + && make install \ + && popd \ + && rm -rf vala \ + && git clone https://gitlab.gnome.org/GNOME/libsoup.git \ + && pushd libsoup \ + && git checkout 2.74.0 \ + && meson _build --prefix=/usr -Dgtk_doc=true \ + && ninja -C _build install \ + && popd \ + && rm -rf libsoup ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/index.html b/.gitlab-ci/index.html new file mode 100644 index 00000000..14412f50 --- /dev/null +++ b/.gitlab-ci/index.html @@ -0,0 +1,11 @@ +<!DOCTYPE html> +<html> + <head> + <meta http-equiv="refresh" content="0; url='./libsoup-3.0/index.html'" /> + <link rel="stylesheet" href="./libsoup-3.0/style.css" /> + </head> + <body> + <ul><p><a href="https://libsoup.org/libsoup-3.0">libsoup 3 documentation</a></p></ul> + <ul><p><a href="https://libsoup.org/libsoup-2.4">libsoup 2 documentation</a></p></ul> + </body> +</html> diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index f23c8151..882b35f4 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:v14" +TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v15" SUDO_CMD="sudo" if docker -v |& grep -q podman; then diff --git a/docs/reference/libsoup-3.0-docs.xml b/docs/reference/libsoup-3.0-docs.xml index b1fa54d6..5c2fbaf6 100644 --- a/docs/reference/libsoup-3.0-docs.xml +++ b/docs/reference/libsoup-3.0-docs.xml @@ -6,7 +6,7 @@ <title>libsoup Reference Manual</title> <releaseinfo> This documentation is for libsoup 3.0 which is in development. - You can find older versions online at <ulink role="online-location" url="https://developer.gnome.org/libsoup/stable/">https://developer.gnome.org/libsoup/stable/</ulink>. + You can find older versions online at <ulink role="online-location" url="https://libsoup.org/libsoup-2.4/index.html">https://libsoup.org/libsoup-2.4/</ulink>. </releaseinfo> </bookinfo> |