.gitlab-ci.yml: split doc-dist.Fedora into build and test

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f53e81fa59df73608f7c053706d7e252060efd0..8edee7ad53da2dd5b3717d8b1dcabef4bf3f1412 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -181,9 +181,9 @@ commit-check:
   tags:
     - gnutls
 
-doc-dist.Fedora:
+fedora-docdist/build:
   extends:
-    - .test
+    - .build
     - .fedora
   needs:
     - fedora/bootstrap
@@ -199,6 +199,17 @@ doc-dist.Fedora:
     - make -j$BUILDJOBS -C doc/latex gnutls.pdf
     - DB2EPUBDIR=$(dirname $(find /usr/share/sgml/docbook/xsl-ns-stylesheets-*/epub/bin/ -name dbtoepub -print))
     - PATH="$PATH:$DB2EPUBDIR" make -C doc gnutls.epub
+  tags:
+    - gnutls
+  when: manual
+
+fedora-docdist/test:
+  extends:
+    - .test
+    - .fedora
+  needs:
+    - fedora-docdist/build
+  script:
     - make -j$CHECKJOBS distcheck
   tags:
     - gnutls
@@ -649,45 +660,6 @@ fedora-static-analyzers/build:
 #     - cppcheck --cppcheck-build-dir=cache/cppcheck --force -q -Ilib/includes -Igl/ -Ilibdane/ -I. --error-exitcode=1 libdane/ -j2 $CPPCHECK_OPTIONS
 #   timeout: 3h
 
-# TODO this does not work, so we keep using old job doc-dist.Fedora
-# Keeping it here until I figure it out.
-#fedora-docdist/build:
-#  extends:
-#    - .build
-#    - .fedora
-#  script:
-#    - SUBMODULE_NOFETCH=1 ./bootstrap
-#    - CFLAGS="-std=c99 -O2 -g" dash ./configure --disable-gcc-warnings --cache-file $CCACHE_FILE --prefix=/usr --libdir=/usr/lib64 --disable-cxx --disable-non-suiteb-curves --enable-gtk-doc --disable-maintainer-mode
-#    - make -j$BUILDJOBS -C doc stamp-vti
-#    - make -j$BUILDJOBS -C doc stamp_enums
-#    - make -j$BUILDJOBS
-#    - make -j$BUILDJOBS -C doc gnutls.html
-#    - make -j$BUILDJOBS -C doc/latex gnutls.pdf
-#    - DB2EPUBDIR=$(dirname $(find /usr/share/sgml/docbook/xsl-ns-stylesheets-*/epub/bin/ -name dbtoepub -print))
-#    - PATH="$PATH:$DB2EPUBDIR" make -C doc gnutls.epub
-#  # we don't throw away intermediate compilation results as /test job does some compiling, too
-#  artifacts:
-#    expire_in: 1 day
-#    paths:
-#      - ./
-#    exclude:
-#      - .git/ # passing forward .git causes warnings and possibly problems
-#      - ./**/.git/ # passing forward .git causes warnings and possibly problems
-#
-#fedora-docdist/test:
-#  extends:
-#    - .test
-#    - .fedora
-#  dependencies:
-#    - fedora-docdist/build
-#  needs:
-#    - fedora-docdist/build
-#  script: # shall we separate it to two jobs?
-#    - export CFLAGS="-std=c99 -O2 -g"
-#    - DB2EPUBDIR=$(dirname $(find /usr/share/sgml/docbook/xsl-ns-stylesheets-*/epub/bin/ -name dbtoepub -print))
-#    - PATH="$PATH:$DB2EPUBDIR" make -C doc gnutls.epub
-#    - make -j$CHECKJOBS distcheck
-
 fedora-abicoverage/build:
   extends:
     - .build