diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2021-06-07 02:01:38 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2021-08-29 22:33:29 +0200 |
| commit | 37036e6bcd5a82f747e093d11161f05afa0e0a11 (patch) | |
| tree | fcbe27aba83ae5a496b54100276e098197febc2f /.gitlab-ci.yml | |
| parent | 834c5e715f8f84c7cd0b3bb09c58db5285bf2903 (diff) | |
| download | tracker-37036e6bcd5a82f747e093d11161f05afa0e0a11.tar.gz | |
ci: Update fedora image with documentation tools
We now need hotdoc to build docs.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2bfc455a9..9cbccfb56 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 -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 + 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: |