Merge branch 'release/1.1.8' into 'stable'

[akkoma] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e98e91e219d04920469fff40662893853072fa84..379529ea6e79e0157cadb5db0352a5891189ffe9 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,12 +30,11 @@ build:
 
 docs-build:
   stage: build
-  only:
-  - master@pleroma/pleroma
+  only: &docs-only
+  - stable@pleroma/pleroma
   - develop@pleroma/pleroma
   variables:
     MIX_ENV: dev
-    PLEROMA_BUILD_ENV: prod
   script:
     - mix deps.get
     - mix compile
@@ -48,19 +47,19 @@ docs-build:
 unit-testing:
   stage: test
   services:
-  - name: lainsoykaf/postgres-with-rum
+  - name: postgres:9.6
     alias: postgres
     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 coveralls --trace --preload-modules
+    - mix coveralls --preload-modules
 
 unit-testing-rum:
   stage: test
   services:
-  - name: lainsoykaf/postgres-with-rum
+  - name: minibikini/postgres-with-rum:12
     alias: postgres
     command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
   variables:
@@ -70,7 +69,7 @@ unit-testing-rum:
     - mix ecto.create
     - mix ecto.migrate
     - "mix ecto.migrate --migrations-path priv/repo/optional_migrations/rum_indexing/"
-    - mix test --trace --preload-modules
+    - mix test --preload-modules
 
 lint:
   stage: test
@@ -86,9 +85,7 @@ analysis:
 docs-deploy:
   stage: deploy
   image: alpine:3.9
-  only:
-  - stable@pleroma/pleroma
-  - develop@pleroma/pleroma
+  only: *docs-only
   before_script:
     - apk update && apk add openssh-client rsync
   script: