Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature...

[akkoma] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0a06509a1c215e7debd7d689dc2e4f6573e62f1..46fa1c74c3777bef1f7f73c1a77d90747ff02075 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,31 @@
-image: elixir:1.4
+image: elixir:1.6.4
 
 services:
   - postgres:9.6.2
 
 variables:
   POSTGRES_DB: pleroma_test
-  POSTGRES_USER: pleroma
-  POSTGRES_PASSWORD: pleroma
+  POSTGRES_USER: postgres
+  POSTGRES_PASSWORD: postgres
+  DB_HOST: postgres
 
 stages:
+  - lint
   - test
 
 before_script:
-  - mix local.hex –force
-  - mix local.rebar –force
+  - mix local.hex --force
+  - mix local.rebar --force
   - mix deps.get
   - MIX_ENV=test mix ecto.create
   - MIX_ENV=test mix ecto.migrate
 
+lint:
+  stage: lint
+  script:
+    - MIX_ENV=test mix format --check-formatted
+
 unit-testing:
   stage: test
   script:
-    - MIX_ENV=test mix test
-
-tags: - elixir 
\ No newline at end of file
+    - MIX_ENV=test mix test --trace