From 41bff5f974f10e132706effdb5952051a159b77c Mon Sep 17 00:00:00 2001 From: jpic Date: Tue, 25 Apr 2017 00:37:17 +0200 Subject: [PATCH 1/3] Indent with 4 spaces like python --- .gitlab-ci.yml | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa6ec43..9ad6768 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,31 +1,31 @@ variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/pip-cache" + PIP_CACHE_DIR: "$CI_PROJECT_DIR/pip-cache" cache: - paths: - - "$CI_PROJECT_DIR/pip-cache" - key: "$CI_PROJECT_ID" + paths: + - "$CI_PROJECT_DIR/pip-cache" + key: "$CI_PROJECT_ID" job test: - script: - - tox - stage: test - tags: [memopol] + script: + - tox + stage: test + tags: [memopol] job install: - script: - - source /srv/memopol/memopol_env/bin/activate - - cd /srv/memopol/memopol_env/src/memopol/docs - - make html - - cd /srv/memopol/memopol_env/src/memopol - - git fetch origin - - git reset --hard origin/master - - find . -name '*.pyc' -delete - - pip install -Ue . - - src/memopol/bin/install_client_deps.sh - - memopol migrate --noinput - - memopol collectstatic --noinput - - touch /srv/memopol/ready - stage: deploy - tags: [memopol] - environment: production - only: - - master + script: + - source /srv/memopol/memopol_env/bin/activate + - cd /srv/memopol/memopol_env/src/memopol/docs + - make html + - cd /srv/memopol/memopol_env/src/memopol + - git fetch origin + - git reset --hard origin/master + - find . -name '*.pyc' -delete + - pip install -Ue . + - src/memopol/bin/install_client_deps.sh + - memopol migrate --noinput + - memopol collectstatic --noinput + - touch /srv/memopol/ready + stage: deploy + tags: [memopol] + environment: production + only: + - master -- GitLab From d4cd9b72280164d14277828c9373bb07092bcbe8 Mon Sep 17 00:00:00 2001 From: jpic Date: Tue, 25 Apr 2017 00:44:01 +0200 Subject: [PATCH 2/3] Gitlab-ci Pipeline configuration --- .gitlab-ci.yml | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ad6768..e288eb4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,12 +5,31 @@ cache: paths: - "$CI_PROJECT_DIR/pip-cache" key: "$CI_PROJECT_ID" -job test: - script: - - tox + +stages: + - test + - deploy + +before_script: + - pip install --user tox + - export PATH="$HOME/.local/bin:$PATH" + +unit: stage: test + script: tox -e py27 tags: [memopol] -job install: + +qa: + stage: test + script: tox -e qa + tags: [memopol] + +docs: + stage: test + script: tox -e docs + tags: [memopol] + +deploy: script: - source /srv/memopol/memopol_env/bin/activate - cd /srv/memopol/memopol_env/src/memopol/docs -- GitLab From 2a2f859222f3e50b8267501c02a55e93525cb628 Mon Sep 17 00:00:00 2001 From: jpic Date: Tue, 25 Apr 2017 00:59:54 +0200 Subject: [PATCH 3/3] Skip docs build if no diff in docs --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e288eb4..1d1b942 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ qa: docs: stage: test - script: tox -e docs + script: git diff --raw HEAD^1 | grep docs || tox -e docs tags: [memopol] deploy: -- GitLab