[tracker/wip/carlosg/hotdoc] ci: Update fedora image with documentation tools
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/carlosg/hotdoc] ci: Update fedora image with documentation tools
- Date: Thu, 5 Aug 2021 15:55:24 +0000 (UTC)
commit 48c3f87c33b6fcc0d4df36d24ca9b8a092d86624
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Jun 7 02:01:38 2021 +0200
ci: Update fedora image with documentation tools
We now need hotdoc to build docs.
.gitlab-ci.yml | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bfc455a9..098bcf94b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,14 +60,14 @@ check-merge-request:
.tracker.fedora@common:
variables:
- BASE_TAG: '2021-06-13.2'
+ BASE_TAG: '2021-08-05.0'
FDO_UPSTREAM_REPO: GNOME/tracker
- FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip
umockdev-devel xmlto uncrustify patch diffutils'
+ FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip
umockdev-devel xmlto uncrustify patch diffutils cmake python-devel'
FDO_DISTRIBUTION_EXEC: |
dnf install -y 'dnf-command(builddep)' &&
dnf builddep -y tracker tracker-miners --setopt=install_weak_deps=False &&
dnf clean all &&
- pip3 install beautifulsoup4 mkdocs mkdocs-cinder tap.py meson
+ pip3 install beautifulsoup4 mkdocs mkdocs-cinder tap.py meson hotdoc
.tracker.ubuntu@common:
variables:
@@ -189,10 +189,10 @@ check-code-style:
.build-template: &build
stage: build
script:
- - meson . build -Db_lto=true -Db_coverage=true -Dsystemd_user_services=false -Dtests_tap_protocol=true
--prefix /usr
+ - meson . build -Ddoc=$([ -z "NO_DOCS" ] && echo "false" || echo "true") -Db_lto=true -Db_coverage=true
-Dsystemd_user_services=false -Dtests_tap_protocol=true --prefix /usr
- ninja -C build
- |
- if [ -z "$NO_DOCS" ]; then ninja -C build libtracker-sparql-3-doc ontology-3-doc; fi
+ if [ -z "$NO_DOCS" ]; then ninja -C build docs/reference/libtracker-sparql/tracker-doc; fi
artifacts:
expire_in: 1 day
paths:
@@ -229,6 +229,8 @@ build-ubuntu-rolling@x86_64:
- .tracker.ubuntu:rolling@x86_64
needs:
- build-ubuntu-container@x86_64
+ variables:
+ NO_DOCS: "true"
<<: *build
build-alpine-edge@x86_64:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]