[retro-gtk/build-doc] ci: Various fixes

[Adrien Plazas <aplazas src gnome org>]

commit 03065e3bf61f5a83f2e4cef926382699a514aa4d
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Sun Apr 12 11:06:51 2020 +0200

    ci: Various fixes

 .gitlab-ci.yml | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfc6824..2ec1daa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
 stages:
-  - doc
   - lint
   - build
   - test
@@ -37,7 +36,7 @@ flatpak:tests:
     MANIFEST_PATH: "flatpak/org.gnome.Retro.UnitTests.json"
     FLATPAK_MODULE: "retro-gtk"
     FLATPAK_BUILD_DIR: "unit-tests"
-    MESON_ARGS: "--libdir=lib -Dinstall-tests=true -Dpulseaudio=disabled"
+    MESON_ARGS: "--libdir=lib -Dinstall-tests=true -Dpulseaudio=disabled -Dbuild-doc=false"
   script:
     - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} ${FLATPAK_BUILD_DIR} 
${MANIFEST_PATH}
     - flatpak build ${FLATPAK_BUILD_DIR} meson --prefix=/app ${MESON_ARGS} _build_tests
@@ -55,7 +54,7 @@ flatpak:demo:
     RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
     FLATPAK_MODULE: "retro-gtk"
     FLATPAK_BUILD_DIR: "app"
-    MESON_ARGS: ""
+    MESON_ARGS: "-Dbuild-doc=false"
   script:
     - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} ${FLATPAK_BUILD_DIR} 
${MANIFEST_PATH}
     - flatpak build ${FLATPAK_BUILD_DIR} meson --prefix=/app ${MESON_ARGS} _build
@@ -70,44 +69,29 @@ flatpak:demo:
 
 flatpak:reference:
   image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-  stage: doc
+  stage: build
   tags:
     - flatpak
   variables:
     MANIFEST_PATH: "flatpak/org.gnome.Retro.Reference.json"
     FLATPAK_MODULE: "retro-gtk"
     FLATPAK_BUILD_DIR: "app"
-    MESON_ARGS: "-Dbuild-doc=true"
+    MESON_ARGS: "-Ddemos=false -Dbuild-tests=false -Dbuild-doc=true"
   script:
     - flatpak-builder --stop-at=${FLATPAK_MODULE} ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
     - flatpak build ${FLATPAK_BUILD_DIR} meson --prefix=/app ${MESON_ARGS} _build
     - flatpak build ${FLATPAK_BUILD_DIR} ninja -C _build retro-gtk-doc
-    - mkdir -p _reference/
     - mv _build/doc/html/ _reference/
   artifacts:
     paths:
       - _reference
 
-# reference:
-#   image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
-#   stage: doc
-#   variables:
-#     EXTRA_MESON_FLAGS: "--buildtype=release"
-#   script:
-#     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dbuild-doc=true _build
-#     - ninja -C _build retro-gtk-doc
-#     - mkdir -p _reference/
-#     - mv _build/doc/html/ _reference/
-#   artifacts:
-#     paths:
-#       - _reference
-
 review:
   stage: review
   dependencies:
     - flatpak:demo
-    - flatpak:tests
     - flatpak:reference
+    - flatpak:tests
   script:
     - echo "Generating flatpak deployment"
   artifacts:
@@ -143,3 +127,5 @@ pages:
   artifacts:
     paths:
       - public
+  only:
+    - master