Merge branch 'ci-interruptable' into 'develop'
GitLab CI: let jobs auto-cancel when a new commit is pushed to the same branch See merge request soapbox-pub/soapbox!2009
This commit is contained in:
commit
636abf6400
1 changed files with 11 additions and 1 deletions
|
@ -33,6 +33,7 @@ danger:
|
||||||
- export CI_MERGE_REQUEST_IID=${CI_OPEN_MERGE_REQUESTS#*!}
|
- export CI_MERGE_REQUEST_IID=${CI_OPEN_MERGE_REQUESTS#*!}
|
||||||
- npx danger ci
|
- npx danger ci
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
interruptible: true
|
||||||
|
|
||||||
lint-js:
|
lint-js:
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -45,6 +46,7 @@ lint-js:
|
||||||
- "**/*.tsx"
|
- "**/*.tsx"
|
||||||
- ".eslintignore"
|
- ".eslintignore"
|
||||||
- ".eslintrc.js"
|
- ".eslintrc.js"
|
||||||
|
interruptible: true
|
||||||
|
|
||||||
lint-sass:
|
lint-sass:
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -54,6 +56,7 @@ lint-sass:
|
||||||
- "**/*.scss"
|
- "**/*.scss"
|
||||||
- "**/*.css"
|
- "**/*.css"
|
||||||
- ".stylelintrc.json"
|
- ".stylelintrc.json"
|
||||||
|
interruptible: true
|
||||||
|
|
||||||
jest:
|
jest:
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -76,6 +79,7 @@ jest:
|
||||||
coverage_report:
|
coverage_report:
|
||||||
coverage_format: cobertura
|
coverage_format: cobertura
|
||||||
path: .coverage/cobertura-coverage.xml
|
path: .coverage/cobertura-coverage.xml
|
||||||
|
interruptible: true
|
||||||
|
|
||||||
nginx-test:
|
nginx-test:
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -85,6 +89,7 @@ nginx-test:
|
||||||
only:
|
only:
|
||||||
changes:
|
changes:
|
||||||
- "installation/mastodon.conf"
|
- "installation/mastodon.conf"
|
||||||
|
interruptible: true
|
||||||
|
|
||||||
build-production:
|
build-production:
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -94,6 +99,7 @@ build-production:
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- static
|
- static
|
||||||
|
interruptible: true
|
||||||
|
|
||||||
docs-deploy:
|
docs-deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
|
@ -107,6 +113,7 @@ docs-deploy:
|
||||||
- develop
|
- develop
|
||||||
changes:
|
changes:
|
||||||
- "docs/**/*"
|
- "docs/**/*"
|
||||||
|
interruptible: true
|
||||||
|
|
||||||
# Supposed to fail when translations are outdated, instead always passes
|
# Supposed to fail when translations are outdated, instead always passes
|
||||||
#
|
#
|
||||||
|
@ -127,6 +134,7 @@ review:
|
||||||
script:
|
script:
|
||||||
- npx -y surge static $CI_COMMIT_REF_SLUG.git.soapbox.pub
|
- npx -y surge static $CI_COMMIT_REF_SLUG.git.soapbox.pub
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
interruptible: true
|
||||||
|
|
||||||
pages:
|
pages:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
|
@ -142,6 +150,7 @@ pages:
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- develop
|
- develop
|
||||||
|
interruptible: true
|
||||||
|
|
||||||
docker:
|
docker:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
|
@ -157,4 +166,5 @@ docker:
|
||||||
- docker push $CI_REGISTRY_IMAGE
|
- docker push $CI_REGISTRY_IMAGE
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- develop
|
- develop
|
||||||
|
interruptible: true
|
Loading…
Reference in a new issue