From 68fa0afea7529eb4c16396d48e715465074e6e40 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@igalia.com>
Date: Mon, 13 May 2019 21:48:36 -0400
Subject: [PATCH] Revert "Add support for building the doc"

This reverts commit 58861fd41092c625caf9f577d9f84574654a7cca.
---
 .gitlab-ci.yml         |  2 --
 gitlab/ci_template.yml | 32 +++-----------------------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a23263..e8d4044 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,6 @@ stages:
   - "full tests"
   # build some apps to check that cross-platform binaries are usable
   - "apps"
-  # Deploy the documentation
-  - "deploy"
 
 test manifest:
   variables:
diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 9361c44..ecba540 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -8,12 +8,11 @@ stages:
   - 'full tests'
   # build some apps to check that cross-platform binaries are usable
   - 'apps'
-  - 'deploy'
 
 variables:
   ANDROID_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/android:2019-03-26-196225'
   CERBERO_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/cerbero-fedora:7ed820aa1fcf95938cc161e397b1bf455f1f5b74'
-  FEDORA_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora:2019-05-13-295487'
+  FEDORA_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora:2019-03-26-196223'
   INDENT_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/gst-indent:6f7e01e1e30a73efa880acdc8e911f1f20c58dbb'
   MANIFEST_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/build-manifest:d19082b72667fb3382bdc3621520c4d26e258b2e'
 
@@ -72,7 +71,6 @@ gst indent:
       - $CI_PROJECT_NAME == "gstreamer-sharp"
       - $CI_PROJECT_NAME == "gst-integration-testsuites"
       - $CI_PROJECT_NAME == "cerbero"
-      - $CI_PROJECT_NAME == "gst-docs"
 
 .build:
   stage: 'full builds'
@@ -120,7 +118,7 @@ build fedora x86_64:
   stage: 'build'
   image: $FEDORA_IMAGE
   variables:
-    MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dsharp=enabled -Domx=enabled -Dgst-omx:target=generic -Ddoc=enabled"
+    MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dsharp=enabled -Domx=enabled -Dgst-omx:target=generic"
 
 build nodebug fedora x86_64:
   extends: '.build'
@@ -169,7 +167,6 @@ build nodebug fedora x86_64:
     variables:
       - $CI_PROJECT_NAME == "cerbero"
       - $CI_PROJECT_NAME == "gst-examples"
-      - $CI_PROJECT_NAME == "gst-docs"
 
 .test fedora x86_64:
   image: $FEDORA_IMAGE
@@ -187,7 +184,6 @@ check fedora:
       - $CI_PROJECT_NAME == "cerbero"
       - $CI_PROJECT_NAME == "gst-examples"
       - $CI_PROJECT_NAME == "gst-omx"
-      - $CI_PROJECT_NAME == "gst-docs"
 
 integration testsuites fedora:
   extends: '.test fedora x86_64'
@@ -201,7 +197,6 @@ integration testsuites fedora:
       - $CI_PROJECT_NAME == "gst-omx"
       - $CI_PROJECT_NAME == "gstreamer-vaapi"
       - $CI_PROJECT_NAME == "cerbero"
-      - $CI_PROJECT_NAME == "gst-docs"
 
 # Valgrind
 .valgrind fedora x86_64:
@@ -302,7 +297,6 @@ valgrind ges:
   except:
     variables:
       - $CI_PROJECT_NAME == "gst-build"
-      - $CI_PROJECT_NAME == "gst-docs"
   cache:
     key: "${CI_JOB_NAME}"
     paths:
@@ -389,7 +383,7 @@ build cerbero fedora x86_64:
       - $CI_PROJECT_NAME == "gst-build"
       - $CI_PROJECT_NAME == "gst-omx"
       - $CI_PROJECT_NAME == "gstreamer-vaapi"
-      - $CI_PROJECT_NAME == "gst-docs"
+
 
 #
 # Cerbero Android Universal build
@@ -423,7 +417,6 @@ build cerbero android universal:
       - $CI_PROJECT_NAME == "gst-build"
       - $CI_PROJECT_NAME == "gst-omx"
       - $CI_PROJECT_NAME == "gstreamer-vaapi"
-      - $CI_PROJECT_NAME == "gst-docs"
 
 #
 # Cerbero Cross Windows builds
@@ -455,7 +448,6 @@ build cerbero cross win32:
       - $CI_PROJECT_NAME == "gst-build"
       - $CI_PROJECT_NAME == "gst-omx"
       - $CI_PROJECT_NAME == "gstreamer-vaapi"
-      - $CI_PROJECT_NAME == "gst-docs"
 
 cerbero deps windows x86_64:
   extends: '.cerbero deps'
@@ -484,7 +476,6 @@ build cerbero cross win64:
       - $CI_PROJECT_NAME == "gst-build"
       - $CI_PROJECT_NAME == "gst-omx"
       - $CI_PROJECT_NAME == "gstreamer-vaapi"
-      - $CI_PROJECT_NAME == "gst-docs"
 
 #
 # Build an Android App using the android binaries
@@ -539,7 +530,6 @@ android universal examples:
       - $CI_PROJECT_NAME == "gst-omx"
       - $CI_PROJECT_NAME == "gst-integration-testsuites"
       - $CI_PROJECT_NAME == "gstreamer-vaapi"
-      - $CI_PROJECT_NAME == "gst-docs"
 
 cerbero android universal examples:
   extends: ".android universal examples"
@@ -548,19 +538,3 @@ cerbero android universal examples:
   only:
     variables:
       - $CI_PROJECT_NAME == "cerbero"
-
-documentation:
-  image: $FEDORA_IMAGE
-  dependencies:
-    - 'build fedora x86_64'
-  stage: deploy
-
-  script:
-  - cd gst-build/
-  - ./gst-uninstalled.py hotdoc run --conf-file=build/subprojects/gst-docs/GStreamer-doc.json --fatal-warnings
-  - cd -
-  - mv gst-build/build/subprojects/gst-docs/GStreamer-doc/html documentation/
-
-  artifacts:
-    paths:
-    - documentation/
-- 
2.7.4