From 62bffc294ab5c2f25f1d06b96b4809612fc96584 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 28 Apr 2020 13:24:31 +0200 Subject: [PATCH 1/3] ci: Update Fedora version to latest stable This newer version of Fedora also includes a newer version of gtk-doc that should satisfy the update dependency: Dependency gtk-doc found: NO found '1.29' but need: '>=1.32' See https://bodhi.fedoraproject.org/updates/FEDORA-2020-f93ef1b300 --- .gitlab-ci/fedora.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 5c509fd66..69548716e 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:30 +FROM fedora:31 RUN dnf -y update \ && dnf -y install \ From 48f756616dfa4e50f0ebd5e98a12e1dbbf2f9abb Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 28 Apr 2020 13:28:50 +0200 Subject: [PATCH 2/3] ci: Fix paths for dist'ed documentation --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b379f53a..692d2c49e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -475,7 +475,7 @@ dist-job: - tar -c -f "gio-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gio html artifacts: paths: - - "${CI_PROJECT_DIR}/_build/glib-docs.tar.xz" - - "${CI_PROJECT_DIR}/_build/gobject-docs.tar.xz" - - "${CI_PROJECT_DIR}/_build/gio-docs.tar.xz" + - "${CI_PROJECT_DIR}/_build/glib-docs-$CI_COMMIT_TAG.tar.xz" + - "${CI_PROJECT_DIR}/_build/gobject-docs-$CI_COMMIT_TAG.tar.xz" + - "${CI_PROJECT_DIR}/_build/gio-docs-$CI_COMMIT_TAG.tar.xz" - "${CI_PROJECT_DIR}/_build/meson-dist/glib-*.tar.xz" From 555fc57a1c228ca1ca03d79de3fdf48363893829 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 28 Apr 2020 14:36:29 +0200 Subject: [PATCH 3/3] ci: Fix documentation tarball compression Best compress using xz when using .tar.xz suffixes. --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 692d2c49e..5ed2d725a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -470,9 +470,9 @@ dist-job: - cd _build - ninja dist - ninja glib-doc gobject-doc gio-doc - - tar -c -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/glib html - - tar -c -f "gobject-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gobject html - - tar -c -f "gio-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gio html + - tar -c -J -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/glib html + - tar -c -J -f "gobject-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gobject html + - tar -c -J -f "gio-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gio html artifacts: paths: - "${CI_PROJECT_DIR}/_build/glib-docs-$CI_COMMIT_TAG.tar.xz"