Skip to content
Snippets Groups Projects
Commit ac48c921 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch 'fork-review' into 'develop'

Should now have review apps on forks

See merge request funkwhale/funkwhale!291
parents 31ae2ecf 2af068be
Branches
No related tags found
No related merge requests found
...@@ -40,7 +40,7 @@ review_front: ...@@ -40,7 +40,7 @@ review_front:
url: http://front-$CI_BUILD_REF_SLUG.$REVIEW_DOMAIN url: http://front-$CI_BUILD_REF_SLUG.$REVIEW_DOMAIN
on_stop: stop_front_review on_stop: stop_front_review
only: only:
- branches@funkwhale/funkwhale - branches
tags: tags:
- funkwhale-review - funkwhale-review
...@@ -51,6 +51,8 @@ stop_front_review: ...@@ -51,6 +51,8 @@ stop_front_review:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
when: manual when: manual
only:
- branches
environment: environment:
name: review/front-$CI_BUILD_REF_NAME name: review/front-$CI_BUILD_REF_NAME
action: stop action: stop
...@@ -83,7 +85,7 @@ review_docs: ...@@ -83,7 +85,7 @@ review_docs:
url: http://docs-$CI_BUILD_REF_SLUG.$REVIEW_DOMAIN url: http://docs-$CI_BUILD_REF_SLUG.$REVIEW_DOMAIN
on_stop: stop_docs_review on_stop: stop_docs_review
only: only:
- branches@funkwhale/funkwhale - branches
tags: tags:
- funkwhale-review - funkwhale-review
...@@ -94,6 +96,8 @@ stop_docs_review: ...@@ -94,6 +96,8 @@ stop_docs_review:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
when: manual when: manual
only:
- branches
environment: environment:
name: review/docs-$CI_BUILD_REF_NAME name: review/docs-$CI_BUILD_REF_NAME
action: stop action: stop
...@@ -140,7 +144,8 @@ test_api: ...@@ -140,7 +144,8 @@ test_api:
FUNKWHALE_URL: "https://funkwhale.ci" FUNKWHALE_URL: "https://funkwhale.ci"
CACHEOPS_ENABLED: "false" CACHEOPS_ENABLED: "false"
DJANGO_SETTINGS_MODULE: config.settings.local DJANGO_SETTINGS_MODULE: config.settings.local
only:
- branches
before_script: before_script:
- cd api - cd api
- pip install -r requirements/base.txt - pip install -r requirements/base.txt
...@@ -157,7 +162,8 @@ test_front: ...@@ -157,7 +162,8 @@ test_front:
image: node:9 image: node:9
before_script: before_script:
- cd front - cd front
only:
- branches
script: script:
- yarn install - yarn install
- yarn run unit - yarn run unit
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment