summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2022-12-12 16:47:16 -0600
committerFederico Mena Quintero <federico@gnome.org>2022-12-12 20:02:27 -0600
commitc212ac8e3218ef8c5ac398a13326061d29a610cd (patch)
treee69ef08d5c9142cc2a9eb7c10157508af0a17737
parent7a0c7f420dca9793c5bb44e0406de3eb5d682284 (diff)
downloadat-spi2-core-c212ac8e3218ef8c5ac398a13326061d29a610cd.tar.gz
CI: build the devel-docs as part of the "reference" job
Now they are built from meson, not a shell script.
-rw-r--r--.gitlab-ci.yml18
-rw-r--r--ci/gen-devel-docs.sh7
2 files changed, 3 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40576a9c..0266e275 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -184,31 +184,19 @@ reference:
MESON_EXTRA_FLAGS: "--buildtype=release -Ddocs=true"
script:
- meson setup ${MESON_EXTRA_FLAGS} --prefix /usr _build .
- - ninja -C _build doc/atk doc/libatspi
+ - ninja -C _build doc/atk doc/libatspi devel-docs/devel-docs
- mkdir _reference
- mv _build/doc/libatspi _reference/libatspi
- mv _build/doc/atk _reference/atk
+ - mv _build/devel-docs/devel-docs _reference/devel-docs
artifacts:
paths:
- _reference
-devel-docs:
- stage: docs
- extends:
- extends:
- - '.container.opensuse@x86_64'
- - '.fdo.distribution-image@opensuse'
- needs: ['opensuse-container@x86_64']
- script:
- - bash -x ./ci/gen-devel-docs.sh
- artifacts:
- paths:
- - public
-
# Publish the test coverage report
pages:
stage: deploy
- needs: [ coverage, reference, devel-docs ]
+ needs: [ coverage, reference ]
script:
- mv _reference/* public/
artifacts:
diff --git a/ci/gen-devel-docs.sh b/ci/gen-devel-docs.sh
deleted file mode 100644
index dd2b011a..00000000
--- a/ci/gen-devel-docs.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-mkdir -p public/devel-docs
-sphinx-build devel-docs public/devel-docs
-