aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-06-29 09:41:31 +0000
committerrinpatch <rinpatch@sdf.org>2019-06-29 09:41:31 +0000
commitf810acc7b06a680c21635dcf3048416bafd43613 (patch)
tree306ce566ebc00919f30e1852fc7c423a59dc0645
parentc82024adcb031e5ebfba24b87cbce041a7251334 (diff)
parentee79c67081cef80d2345fdc9b96e925354020671 (diff)
downloadpleroma-f810acc7b06a680c21635dcf3048416bafd43613.tar.gz
Merge branch 'fix/no-untagged-builds-master' into 'develop'
Build releases only on tags or develop See merge request pleroma/pleroma!1355
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8711f299..3868cb603 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,7 +148,7 @@ 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
+ - tags
- develop@pleroma/pleroma
artifacts: &release-artifacts
name: "pleroma-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME"