From f52a973a6ec7f1fa4749721a10979198ab16639e Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 4 Jan 2024 17:41:30 +0000 Subject: [PATCH] ci: Fix tarballing the docs on dist The generated docs are discarded by `meson dist` after building the dist tarball, so we need to compile them again. And they get generated in the `_build` directory, not the source directory. Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 647e374d1..1f5a91d79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -755,10 +755,12 @@ dist-job: - meson subprojects download - meson setup ${MESON_COMMON_OPTIONS} --buildtype release -Ddocumentation=true -Dman-pages=enabled _build - meson dist -C _build - - tar -c -J -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/glib glib - - tar -c -J -f "gmodule-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gmodule gmodule - - tar -c -J -f "gobject-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gobject gobject - - tar -c -J -f "gio-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gio gio + # Compile again to build the docs + - meson compile -C _build + - tar -c -J -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C _build/docs/reference/glib glib + - tar -c -J -f "gmodule-docs-$CI_COMMIT_TAG.tar.xz" -C _build/docs/reference/gmodule gmodule + - tar -c -J -f "gobject-docs-$CI_COMMIT_TAG.tar.xz" -C _build/docs/reference/gobject gobject + - tar -c -J -f "gio-docs-$CI_COMMIT_TAG.tar.xz" -C _build/docs/reference/gio gio artifacts: paths: - "${CI_PROJECT_DIR}/_build/glib-docs-$CI_COMMIT_TAG.tar.xz"