diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-07-04 02:04:24 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-07-04 02:04:24 +0000 |
| commit | 53f4d6f2381abc31f9419c1346a14ad4cdd55b04 (patch) | |
| tree | c3cd0128e5091b34892fcba06329e1e19995cced | |
| parent | 6fbbf80800792b6647fe3eafc50eb51cbf491eeb (diff) | |
| parent | 8c3363a5e778899fe137273c2d188ebd3b9224fb (diff) | |
| download | pleroma-53f4d6f2381abc31f9419c1346a14ad4cdd55b04.tar.gz pleroma-53f4d6f2381abc31f9419c1346a14ad4cdd55b04.zip | |
Merge branch 'fix/pipeline-triggers' into 'develop'
CI: Fix pipeline tokens & exit status
See merge request pleroma/pleroma!3918
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | changelog.d/pipeline-triggers.skip | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 148cbe405..cd0561852 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -230,7 +230,7 @@ docs-deploy: before_script: - apk add curl script: - - 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 + - curl --fail-with-body -X POST -F"token=$CI_JOB_TOKEN" -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 @@ -271,7 +271,7 @@ spec-deploy: before_script: - apk add curl script: - - curl -X POST -F"token=$API_DOCS_PIPELINE_TRIGGER" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" -F"variables[JOB_REF]=$CI_JOB_ID" https://git.pleroma.social/api/v4/projects/1130/trigger/pipeline + - curl --fail-with-body -X POST -F"token=$CI_JOB_TOKEN" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" -F"variables[JOB_REF]=$CI_JOB_ID" https://git.pleroma.social/api/v4/projects/1130/trigger/pipeline stop_review_app: diff --git a/changelog.d/pipeline-triggers.skip b/changelog.d/pipeline-triggers.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/pipeline-triggers.skip |