diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2019-01-03 19:34:33 +0100 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-01-03 19:34:33 +0100 |
| commit | 0c96702e056f6e1afa67c0dff60a4a539efbe668 (patch) | |
| tree | 9eeb486e0fc52f91e5b158c1ae256a0672593885 | |
| parent | 50e304b2393411f3402173feeb36731c548c6c03 (diff) | |
| download | gobject-introspection-0c96702e056f6e1afa67c0dff60a4a539efbe668.tar.gz | |
meson: disable doctool by default
To unbreak continuous
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msys2-meson.sh | 2 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 469dbc21..b98e7e42 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ fedora-x86_64-meson: CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache" CFLAGS: "-Werror" script: - - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Dgtk-doc=true -Dcairo=true -Dpython=python3 _build . + - meson --prefix /usr --libdir /usr/lib64 --buildtype debug -Ddoctool=true -Dgtk-doc=true -Dcairo=true -Dpython=python3 _build . - cd _build - ninja - meson test --print-errorlogs --suite=gobject-introspection --no-suite=glib diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh index daeca63a..7c63581c 100644 --- a/.gitlab-ci/test-msys2-meson.sh +++ b/.gitlab-ci/test-msys2-meson.sh @@ -38,7 +38,7 @@ export PATH="$HOME/.local/bin:$PATH" # Passing the full interpreter path works around the issue PYTHON="$(which python3)" export CFLAGS="-Werror" -meson -Dcairo=true -Dpython="${PYTHON}" --buildtype debug _build +meson -Dcairo=true -Ddoctool=true -Dpython="${PYTHON}" --buildtype debug _build cd _build ninja diff --git a/meson_options.txt b/meson_options.txt index ee6958dd..f268607a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,7 +2,7 @@ option('cairo', type: 'boolean', value : false, description: 'Use cairo for tests' ) -option('doctool', type: 'boolean', value : true, +option('doctool', type: 'boolean', value : false, description: 'Install g-ir-doc-tool' ) |