diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9dbca4..4cfb367 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - test - deploy -tests: +server-tests: image: python:3.6-slim-stretch stage: test script: @@ -13,16 +13,25 @@ tests: tags: - docker +administration-client-tests: + image: node:8.11-stretch + stage: test + script: + - yarn install + - yarn run test:unit + tags: + - docker + pages: image: python:3.6-slim-stretch stage: deploy script: - - python3 -m pip install pipenv - - cd server - - pipenv install --dev --system - - cd documentation - - sphinx-build -M html "." "_build" - - mv _build/html/ ../../public/ + - python3 -m pip install pipenv + - cd server + - pipenv install --dev --system + - cd documentation + - sphinx-build -M html "." "_build" + - mv _build/html/ ../../public/ artifacts: paths: - public diff --git a/administration_client/package.json b/administration_client/package.json index 6f73045..02f9785 100644 --- a/administration_client/package.json +++ b/administration_client/package.json @@ -1,5 +1,5 @@ { - "name": "administration_client", + "name": "atheneum_administration_client", "version": "0.1.0", "private": true, "scripts": { diff --git a/administration_client/public/index.html b/administration_client/public/index.html index 4ec8aa8..464b0c9 100644 --- a/administration_client/public/index.html +++ b/administration_client/public/index.html @@ -9,7 +9,7 @@