Merge branch 'release/1.1.3' into 'stable'

[akkoma] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0c540b16f7ebcb5fd648ab1a60aa6d962a75098..3f5703aa129455da5b4198c1664d294676a2a683 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
@@ -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: