diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9adc47d..f89c018 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,20 +1,28 @@ --- -image: s3lph/matemat-ci:20180619-01 +image: s3lph/matemat-ci:20180710-03 stages: - test - codestyle +- deploy test: stage: test script: - pip3 install -r requirements.txt - - python3-coverage run --branch -m unittest discover matemat - - python3-coverage report -m --include 'matemat/*' --omit '*/test_*.py' + - sudo -u matemat python3-coverage run --branch -m unittest discover matemat + - sudo -u matemat python3-coverage report -m --include 'matemat/*' --omit '*/test_*.py' codestyle: stage: codestyle script: - pip3 install -r requirements.txt - - pycodestyle matemat -# - mypy --ignore-missing-imports --strict -p matemat + - sudo -u matemat pycodestyle matemat +# - sudo -u matemat mypy --ignore-missing-imports --strict -p matemat + +docker_build_push: + stage: deploy + script: + - docker build -t "registry.gitlab.com/s3lph/matemat:$(git rev-parse HEAD)" . + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_TOKEN registry.gitlab.com + - docker push "registry.gitlab.com/s3lph/matemat:$(git rev-parse HEAD)" diff --git a/doc b/doc index 51e9404..9634785 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit 51e940460ddbaebb7f2ffc48d00d9ef19cf8d33f +Subproject commit 9634785e5621b324f72598b3cee83bbc45c25d7b diff --git a/testing/Dockerfile b/testing/Dockerfile index 126a06f..5c0e1b3 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -3,8 +3,7 @@ FROM debian:buster RUN useradd -d /home/matemat -m matemat RUN apt-get update -qy -RUN apt-get install -y --no-install-recommends python3-dev python3-pip python3-coverage python3-setuptools build-essential +RUN apt-get install -y --no-install-recommends sudo git docker.io python3-dev python3-pip python3-coverage python3-setuptools build-essential RUN pip3 install wheel pycodestyle mypy WORKDIR /home/matemat -USER matemat