Merge branch 'filetype-recognition' into 'develop'

[akkoma] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48503208e80ff4f158155d4ca9061d24d5c63170..b7608e0a96cf5ea44ae1b2650b7eeddfb228cff6 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,19 @@
-image: elixir:1.4
+image: elixir:1.5
 
 services:
   - postgres:9.6.2
 
 variables:
   POSTGRES_DB: pleroma_test
-  POSTGRES_USER: pleroma
-  POSTGRES_PASSWORD: pleroma
+  POSTGRES_USER: postgres
+  POSTGRES_PASSWORD: postgres
 
 stages:
   - 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
@@ -21,4 +21,4 @@ before_script:
 unit-testing:
   stage: test
   script:
-    - MIX_ENV=test mix test
\ No newline at end of file
+    - MIX_ENV=test mix test