From: kaniini <ariadne@dereferenced.org>
Date: Mon, 30 Sep 2019 15:37:03 +0000 (+0000)
Subject: Merge branch 'ci/build-otp-maint' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=96e1db1cf1c244ccdd0ec02516f4bb2cce49154a;p=akkoma

Merge branch 'ci/build-otp-maint' into 'develop'

CI: Enable OTP release building for maint/* branches

See merge request pleroma/pleroma!1749

(cherry picked from commit 7c9b023a918c84b60ae6547289a083c671a3659b)

71315800 CI: Enable OTP release building for maint/* branches
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0c540b16..7bee30e08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -151,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: