Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'

[akkoma] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa5dafdb21f38f0a2ad54891aec075ec92682723..7bee30e08bb882899ace7f199e31a1482bfa410a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,7 @@ docs-build:
   - develop@pleroma/pleroma
   variables:
     MIX_ENV: dev
+    PLEROMA_BUILD_ENV: prod
   script:
     - mix deps.get
     - mix compile
@@ -150,6 +151,7 @@ amd64:
   only: &release-only
   - master@pleroma/pleroma
   - develop@pleroma/pleroma
+  - /^maint/.*$/@pleroma/pleroma
   artifacts: &release-artifacts
     name: "pleroma-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME"
     paths:
@@ -173,7 +175,7 @@ amd64:
   script: &release
     - mix deps.get --only prod
     - mkdir release
-    - PLEROMA_BUILD_BRANCH=$CI_COMMIT_REF_NAME
+    - export PLEROMA_BUILD_BRANCH=$CI_COMMIT_REF_NAME
     - mix release --path release