[CI][DOCS] fix .gitlab-ci.yml

.gitlab-ci.yml

@@ -34,7 +34,7 @@ windows_tests:
     stage: test_code
     tags:
         - docker-executor
-    script:
+    script: &ubuntu-script
         - pip install --extra-index-url https://pypi-sissource.ethz.ch/simple emzed3
         - pip install -e .
         - pip install -r requirements_dev.txt
@@ -54,15 +54,22 @@ ubuntu_19_10:
 ubuntu_20_04:
     <<: *ubuntu
     image: sissource.ethz.ch:5005/sispub/emzed/linux_base_images/ubuntu_20_04_for_emzed
+    script:
+      - *ubuntu-script
+      - make build_docs
+    artifacts:
+      paths:
+        - docs/_build/html
 
 
 update_docs:
     stage: update_docs
+    image: sissource.ethz.ch:5005/sispub/emzed/linux_base_images/ubuntu_20_04_for_emzed
+    tags:
+        - docker-executor
     script:
-        - pyenv local $(latest_python 3.7)
-        - tox -e docs
-        - cp -R htmlcov docs/_build/html
-        - rsync -r docs/_build/html/* emzed.ethz.ch:htdocs/3/emzed.ext.mzmine2/
+        - chmod 0600 ${SSH_PRIVATE_KEY}
+        - scp -r -i ${SSH_PRIVATE_KEY} -o 'StrictHostKeyChecking no' docs/_build/html/* w3_emzed2@emzed.ethz.ch:htdocs/3/emzed.ext.mzmine2
     dependencies:
         - ubuntu_20_04
     rules:

Makefile

@@ -37,12 +37,23 @@ coverage:
 	coverage html
 	open htmlcov/index.html
 
-docs:
-	rm -f docs/emzed.ext.mzmine2*.rst
-	sphinx-apidoc --implicit-namespaces -e -o docs/ src/emzed_ext_mzmine2/
+
+build_docs:
+	sphinx-apidoc --implicit-namespaces -e -o docs -f src/emzed_ext_mzmine2/
+	$(MAKE) -C docs clean
+	$(MAKE) -C docs html
+	cp -R htmlcov docs/_build/html
+
+
+update_docs:
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs html
 	cp -R htmlcov docs/_build/html
+
+deploy_docs: update_docs
+	scp -r docs/_build/html/* w3_emzed2@emzed.ethz.ch:htdocs/3/emzed.ext.mzmine2
+
+docs: build_docs
 	open docs/_build/html/index.html
 
 sdist: clean