diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2021-06-28 08:53:04 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2021-06-28 08:53:04 +0000 |
| commit | 80a96846dbe26726a31642c24d81a6d137a924ec (patch) | |
| tree | 404faa1eb7886708db24e7957992c4278a3d7b95 | |
| parent | f59c8da9f993e87c9ed902d468e52caad83f9223 (diff) | |
| parent | 8fa8fbfe82c42ebf7c097ec8c564daf1da991bf5 (diff) | |
| download | tracker-80a96846dbe26726a31642c24d81a6d137a924ec.tar.gz | |
Merge branch 'sam/ci-docs' into 'master'
ci: Build documentation when testing
Closes #310
See merge request GNOME/tracker!434
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01b2bd597..2bfc455a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -191,6 +191,8 @@ check-code-style: script: - meson . build -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 artifacts: expire_in: 1 day paths: @@ -235,6 +237,8 @@ build-alpine-edge@x86_64: - .tracker.alpine:edge@x86_64 needs: - build-alpine-container@x86_64 + variables: + NO_DOCS: "true" <<: *build .test-template: &test diff --git a/meson.build b/meson.build index 4f12251aa..8b4e41387 100644 --- a/meson.build +++ b/meson.build @@ -387,6 +387,8 @@ summary = [ ' Unicode support library: ' + unicode_library_name, ' Use external FTS module: ' + (not sqlite3_has_builtin_fts5).to_string(), ' Build with Stemming support: ' + have_libstemmer.to_string(), + ' API documentation: ' + get_option('docs').to_string(), + ' CLI documentation (manpages): ' + get_option('man').to_string(), ] if get_option('bash_completion') |