Merge branch 'fix/mastoapi-attachment-linking' into 'develop'

[akkoma] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0a06509a1c215e7debd7d689dc2e4f6573e62f1..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
@@ -22,5 +22,3 @@ unit-testing:
   stage: test
   script:
     - MIX_ENV=test mix test
-
-tags: - elixir 
\ No newline at end of file