From 25796148b968a75d6c756543cbfc1f6a06370694 Mon Sep 17 00:00:00 2001 From: Drew Short Date: Sun, 29 Jul 2018 14:46:33 -0500 Subject: [PATCH 1/2] Adding GitLab pages integration --- .gitlab-ci.yml | 21 +++++++++++++++++++++ README.md | 2 +- server/README.md | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd2fa99..fd38265 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ stages: - test + - pages Atheneum:Tests: image: python:3.6-slim-stretch @@ -11,3 +12,23 @@ Atheneum:Tests: - bash ./run_tests.sh tags: - docker + +Atheneum:Pages: + image: python:3.6-slim-stretch + stage: pages + script: + - python3 -m pip install pipenv + - pipenv install --dev + - pipenv shell + - cd server/documentation + - apt --no-cache install make + - make html + - mv _build/html/ ../../public/ + artifacts: + paths: + - public + tags: + - docker + - gce + only: + - master diff --git a/README.md b/README.md index 5187763..318abfa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Atheneum +# Atheneum [![pipeline status](https://gitlab.com/WarrickSothr/Atheneum/badges/master/pipeline.svg)](https://gitlab.com/WarrickSothr/Atheneum/commits/master) An ebook/comic library service and web client. diff --git a/server/README.md b/server/README.md index 12b310c..0492de8 100644 --- a/server/README.md +++ b/server/README.md @@ -1,5 +1,7 @@ # Atheneum Server +## [API Documentation](https://warricksothr.gitlab.io/Atheneum) + ## Requirements * Python 3.6 From d198610eeaa1499f58f4f081c19b1f679986b9cc Mon Sep 17 00:00:00 2001 From: Drew Short Date: Sun, 29 Jul 2018 14:47:06 -0500 Subject: [PATCH 2/2] Removed gce tag from gitlab build file --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd38265..011ed30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,5 @@ Atheneum:Pages: - public tags: - docker - - gce only: - master