summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-06-29 10:35:32 +0000
committerrinpatch <rinpatch@sdf.org>2019-06-29 10:35:32 +0000
commit9504544d5b5768dfa3fa8eb51143f2f3b4bf318f (patch)
treec5ea0b43b473f65cc3d04eb63d88062279597ced
parente9426d15d8e86a5445b5da4dda76128e605c5912 (diff)
parent5bc9e6e0f385f090eca55c869db0323ae7957f25 (diff)
Merge branch 'revert/tags-releases' into 'master'
Revert "Build releases only on tags or develop" See merge request pleroma/pleroma!1356
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3868cb603..f8711f299 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
- - tags
+ - master@pleroma/pleroma
- develop@pleroma/pleroma
artifacts: &release-artifacts
name: "pleroma-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME"