Merge remote-tracking branch 'pleroma/develop' into feature/disable-account

[akkoma] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70fe82ee0659bd492fbb17d6a5651ec2e48a7ad0..dc99b81ee4cd25dc0332fe77425d66f52ee99e6a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 image: elixir:1.8.1
 
-
 variables:
   POSTGRES_DB: pleroma_test
   POSTGRES_USER: postgres
@@ -28,7 +27,7 @@ build:
   - mix deps.get
   - mix compile --force
 
-docs_build:
+docs-build:
   stage: build
   only:
   - master@pleroma/pleroma
@@ -49,6 +48,7 @@ unit-testing:
   - name: postgres:9.6.2
     command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
   script:
+    - mix deps.get
     - mix ecto.create
     - mix ecto.migrate
     - mix test --trace --preload-modules
@@ -65,10 +65,9 @@ analysis:
     - mix credo --strict --only=warnings,todo,fixme,consistency,readability
 
 
-docs_deploy:
+docs-deploy:
   stage: deploy
   image: alpine:3.9
-  services:
   only:
   - master@pleroma/pleroma
   - develop@pleroma/pleroma
@@ -79,4 +78,4 @@ docs_deploy:
     - echo "${SSH_HOST_KEY}" > ~/.ssh/known_hosts
     - eval $(ssh-agent -s)
     - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
-    - rsync -hrvz --delete -e "ssh -p ${SSH_PORT}" priv/static/doc/ "${SSH_USER_HOST_LOCATION}/${CI_COMMIT_REF_NAME}" 
+    - rsync -hrvz --delete -e "ssh -p ${SSH_PORT}" priv/static/doc/ "${SSH_USER_HOST_LOCATION}/${CI_COMMIT_REF_NAME}"