Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists

[akkoma] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53f05ae9223bdb1e298cf54bbc932c6fbea491d5..58c9de167cefb30b0c807d7792c468c5b5b34e54 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,8 +52,7 @@ unit-testing:
     - mix deps.get
     - mix ecto.create
     - mix ecto.migrate
-    - mix test --trace --preload-modules
-    - mix coveralls
+    - mix coveralls --trace --preload-modules
 
 unit-testing-rum:
   stage: test
@@ -122,8 +121,7 @@ review_app:
     - (ssh -t dokku@pleroma.online -- postgres:create $(echo $CI_ENVIRONMENT_SLUG | sed -e 's/-/_/g')_db) || true
     - (ssh -t dokku@pleroma.online -- postgres:link $(echo $CI_ENVIRONMENT_SLUG | sed -e 's/-/_/g')_db "$CI_ENVIRONMENT_SLUG") || true
     - (ssh -t dokku@pleroma.online -- certs:add "$CI_ENVIRONMENT_SLUG" /home/dokku/server.crt /home/dokku/server.key) || true
-    - (git remote add dokku dokku@pleroma.online:$CI_ENVIRONMENT_SLUG) || true
-    - git push -f dokku $CI_COMMIT_SHA:refs/heads/master
+    - git push -f dokku@pleroma.online:$CI_ENVIRONMENT_SLUG $CI_COMMIT_SHA:refs/heads/master
 
 stop_review_app:
   image: alpine:3.9