X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=.gitlab-ci.yml;h=379529ea6e79e0157cadb5db0352a5891189ffe9;hb=703e5829dd612d8093cd2a588f445212ad82a4da;hp=d0c540b16f7ebcb5fd648ab1a60aa6d962a75098;hpb=1417627d07a29e06efec2b282405e72bcfb1269c;p=akkoma

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0c540b16..379529ea6 100644
--- 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:
-  - master@pleroma/pleroma
-  - develop@pleroma/pleroma
+  only: *docs-only
   before_script:
     - apk update && apk add openssh-client rsync
   script:
@@ -149,8 +146,10 @@ amd64:
   # TODO: Replace with upstream image when 1.9.0 comes out
   image: rinpatch/elixir:1.9.0-rc.0
   only: &release-only
-  - master@pleroma/pleroma
+  - stable@pleroma/pleroma
   - develop@pleroma/pleroma
+  - /^maint/.*$/@pleroma/pleroma
+  - /^release/.*$/@pleroma/pleroma
   artifacts: &release-artifacts
     name: "pleroma-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME"
     paths: