projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'final-release-prep' into 'maint/1.1'
[akkoma]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index d0c540b16f7ebcb5fd648ab1a60aa6d962a75098..e98e91e219d04920469fff40662893853072fa84 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-87,7
+87,7
@@
docs-deploy:
stage: deploy
image: alpine:3.9
only:
stage: deploy
image: alpine:3.9
only:
- -
master
@pleroma/pleroma
+ -
stable
@pleroma/pleroma
- develop@pleroma/pleroma
before_script:
- apk update && apk add openssh-client rsync
- develop@pleroma/pleroma
before_script:
- apk update && apk add openssh-client rsync
@@
-149,8
+149,10
@@
amd64:
# TODO: Replace with upstream image when 1.9.0 comes out
image: rinpatch/elixir:1.9.0-rc.0
only: &release-only
# 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
+ -
stable
@pleroma/pleroma
- develop@pleroma/pleroma
- develop@pleroma/pleroma
+ - /^maint/.*$/@pleroma/pleroma
+ - /^release/.*$/@pleroma/pleroma
artifacts: &release-artifacts
name: "pleroma-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME"
paths:
artifacts: &release-artifacts
name: "pleroma-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME"
paths: