[tracker/wip/carlosg/test: 1/3] ci: Update fedora image with documentation tools




commit 94459a55e1a0da211b0e269685135697bdaa6272
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 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bfc455a9..f106e6ea6 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,7 +189,7 @@ 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 -Ddocs=$([ -z "$NO_DOCS" ] && echo "true" || echo "false") -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
@@ -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]