From a37f86795a9dd5247c0765f7c1521aa03c11fceb Mon Sep 17 00:00:00 2001
From: Carel van Niekerk <carel.niekerk@hhu.de>
Date: Wed, 15 Apr 2020 14:09:59 +0200
Subject: [PATCH] Update conf.py, .gitlab-ci.yml files
---
.gitlab-ci.yml | 4 +++-
conf.py | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b0da7a..4cbdea2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ test:
stage: test
script:
- pip install -U sphinx
+ - cp -r Docs/* .
- sphinx-build -b html . public
only:
- branches
@@ -14,10 +15,11 @@ pages:
stage: deploy
script:
- pip install -U sphinx
+ - cp -r Docs/* .
- sphinx-build -b html . public
- cp Docs/hhu-logo.png public/_static/hhu-logo.png
artifacts:
paths:
- - public/Docs
+ - public
only:
- master
diff --git a/conf.py b/conf.py
index 92df794..dc3d753 100644
--- a/conf.py
+++ b/conf.py
@@ -73,7 +73,7 @@ source_suffix = '.rst'
#source_encoding = 'utf-8-sig'
# The master toctree document.
-master_doc = 'Docs/index'
+master_doc = 'index'
# General information about the project.
project = 'PyDial3'
--
GitLab