diff options
| author | lain <lain@soykaf.club> | 2019-10-10 14:40:59 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-10 14:40:59 +0200 |
| commit | c54ae662dcc08c0c04a1dff7bb7a361665e877b8 (patch) | |
| tree | afb9cce0d7bcc15cd2fe3221609d7883d45d0057 /.gitlab-ci.yml | |
| parent | 02f8e2a8ab65c3e8497bab4576ce4e75f8df3217 (diff) | |
| parent | 6355694309b0bad3687a8a7820b81ebf6625751d (diff) | |
| download | pleroma-c54ae662dcc08c0c04a1dff7bb7a361665e877b8.tar.gz | |
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09684df02..460c1311f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,19 +99,14 @@ analysis: docs-deploy: stage: deploy - image: alpine:3.9 + image: alpine:latest only: - master@pleroma/pleroma - develop@pleroma/pleroma before_script: - - apk update && apk add openssh-client rsync + - apk add curl script: - - mkdir -p ~/.ssh - - echo "${SSH_HOST_KEY}" > ~/.ssh/known_hosts - - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - - rsync -hrvz --delete -e "ssh -p ${SSH_PORT}" priv/static/doc/ "${SSH_USER_HOST_LOCATION}/${CI_COMMIT_REF_NAME}" - + - curl -X POST -F"token=$DOCS_PIPELINE_TRIGGER" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" https://git.pleroma.social/api/v4/projects/673/trigger/pipeline review_app: image: alpine:3.9 stage: deploy @@ -165,6 +160,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: |