[libadwaita/wip/exalm/gi-docgen] fixup
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita/wip/exalm/gi-docgen] fixup
- Date: Fri, 7 May 2021 10:32:03 +0000 (UTC)
commit 685877c334a7cb8957ce5a32d900f6be25497bf4
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Fri May 7 15:16:58 2021 +0500
fixup
I'll just add deps into the yml for now to avoid rebuilding the image.
.gitlab-ci.yml | 14 ++++++++------
.gitlab-ci/docs.Dockerfile | 23 +++++++++++++++++++++++
2 files changed, 31 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47edcae..56094d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ variables:
FLATPAK_MODULE: 'libadwaita'
FLATPAK_BUILD_DIR: build
ABI_CHECKER_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/abi-checker:v1"
+ DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/docs:v1"
stages:
- build
@@ -19,7 +20,7 @@ api-visibility:
- ./.gitlab-ci/api-visibility.sh
doc:
- image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+ image: $DOCS_IMAGE
stage: build
tags:
- flatpak
@@ -27,12 +28,13 @@ doc:
MESON_ARGS: >-
-Dbuild-tests=false
-Dgtk_doc=true
- -Dintrospection=disabled
+ -Dvapi=false
+ before_script:
+ - dnf -y install gobject-introspection-devel
script:
- - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} ${FLATPAK_BUILD_DIR}
${MANIFEST_PATH}
- - flatpak build ${FLATPAK_BUILD_DIR} meson --prefix=/app ${SHARED_MESON_ARGS} ${MESON_ARGS} _build
- - flatpak build ${FLATPAK_BUILD_DIR} ninja -C _build libadwaita-1-doc
- - mv _build/doc/html/ _doc/
+ - meson --prefix=/app ${MESON_ARGS} _build
+ - ninja -C _build
+ - mv _build/doc/ _doc/
artifacts:
paths:
- _doc
diff --git a/.gitlab-ci/docs.Dockerfile b/.gitlab-ci/docs.Dockerfile
new file mode 100644
index 0000000..c04c234
--- /dev/null
+++ b/.gitlab-ci/docs.Dockerfile
@@ -0,0 +1,23 @@
+FROM fedora:34
+
+RUN dnf -y update \
+ && dnf -y install \
+ @development-tools \
+ dnf-plugins-core \
+ gcc \
+ git \
+ gobject-introspection \
+ gtk4-devel \
+ meson \
+ pcre-static \
+ python3 \
+ python3-jinja2 \
+ python3-markdown \
+ python3-pip \
+ python3-pygments \
+ python3-toml \
+ python3-typogrify \
+ python3-wheel \
+ redhat-rpm-config \
+ sassc \
+ && dnf clean all
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]