diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b379f53a950aab70cd1da79a382fe44730e4217..5ed2d725acc54e87e17e119001487d82911dd2fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -470,12 +470,12 @@ 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.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" diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 5c509fd66fcae9d349d3191d089855bd09b91ee9..69548716e17e3deb767d10223d830b3bc375c915 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 \