Browse Source

Merge branch 'development' into 'master'

Development

See merge request warricksothr/Atheneum!2
merge-requests/8/head
Drew Short 6 years ago
parent
commit
5452447a53
  1. 20
      .gitlab-ci.yml
  2. 2
      README.md
  3. 2
      server/README.md

20
.gitlab-ci.yml

@ -1,5 +1,6 @@
stages:
- test
- pages
Atheneum:Tests:
image: python:3.6-slim-stretch
@ -11,3 +12,22 @@ 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
only:
- master

2
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.

2
server/README.md

@ -1,5 +1,7 @@
# Atheneum Server
## [API Documentation](https://warricksothr.gitlab.io/Atheneum)
## Requirements
* Python 3.6

Loading…
Cancel
Save