[tracker/sam/website-docs-fix] website: Stab in the dark and fixing why the docs aren't being uploaded
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/sam/website-docs-fix] website: Stab in the dark and fixing why the docs aren't being uploaded
- Date: Wed, 22 Apr 2020 17:39:20 +0000 (UTC)
commit f359e8d506c855ed081bab64116e992e75ea4cb0
Author: Sam Thursfield <sam afuera me uk>
Date: Wed Apr 22 19:19:40 2020 +0200
website: Stab in the dark and fixing why the docs aren't being uploaded
Since we install into /tmp, maybe the files are deleted again during
the job??
.gitlab-ci.yml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eca711488..40db6ce44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,16 +87,19 @@ pages:
before_script:
- pip3 install beautifulsoup4 mkdocs mkdocs-cinder
script:
- # Build tracker and install.
- - su tracker -c 'mkdir build; cd build; meson .. --prefix=/tmp/tracker; ninja install'
- # Build tracker-miners and install any documentation from there as well.
- - su tracker -c '.gitlab-ci/checkout-tracker-miners.sh'
- - su tracker -c 'cd extra/tracker-miners; mkdir build; cd build; env
PKG_CONFIG_PATH=/tmp/tracker/lib64/pkgconfig meson .. --prefix=/tmp/tracker; ninja install'
+ - |
+ install_prefix="$(pwd)/tracker-install"
+ # Build tracker and install.
+ su tracker -c 'mkdir build; cd build; meson .. --prefix="$install_prefix"; ninja install'
+ # Build tracker-miners and install any documentation from there as well.
+ su tracker -c '.gitlab-ci/checkout-tracker-miners.sh'
+ su tracker -c 'cd extra/tracker-miners; mkdir build; cd build; env
PKG_CONFIG_PATH="$install_prefix/lib64/pkgconfig" meson .. --prefix="$install_prefix"; ninja install'
# Generate the website using mkdocs.
- |
+ install_prefix="$(pwd)/tracker-install"
tracker_commit=$CI_COMMIT_SHA1
tracker_miners_commit=$(git -C ./extra/tracker-miners rev-parse HEAD)
- ./docs/website/build.py --api-docs=/tmp/tracker/share/gtk-doc/html --tracker-commit=${tracker_commit}
--man-pages ./docs/manpages/*.txt ./extra/tracker-miners/docs/manpages/*.txt
+ ./docs/website/build.py --api-docs="$install_prefix/share/gtk-doc/html"
--tracker-commit=${tracker_commit} --man-pages ./docs/manpages/*.txt
./extra/tracker-miners/docs/manpages/*.txt
artifacts:
paths:
- public
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]