diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-29 10:39:52 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-29 10:39:52 +0000 |
| commit | a8c9522e04c5d687f8985698de864cccdf3d65e1 (patch) | |
| tree | c3ba11a443af851684e0c67d676d3414ea79183d | |
| parent | f810acc7b06a680c21635dcf3048416bafd43613 (diff) | |
| parent | 0f6e333d8be84c6b75552411cd6838b9a0a16cad (diff) | |
| download | pleroma-a8c9522e04c5d687f8985698de864cccdf3d65e1.tar.gz | |
Merge branch 'revert/tags-releases-develop' into 'develop'
Revert "Build releases only on tags or develop" on develop
See merge request pleroma/pleroma!1357
| -rw-r--r-- | .gitlab-ci.yml | 2 |
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" |