fix ci --check
This commit is contained in:
parent
84e7a8e915
commit
e7009473e6
|
@ -18,9 +18,9 @@ test-api-dev:
|
||||||
services:
|
services:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
script:
|
script:
|
||||||
- docker-compose -f docker-compose.ci.yml up -d
|
- docker-compose -f docker-compose.ci.yml --env-file .env.test up -d
|
||||||
- sh ci/wait-up.sh
|
- sh ci/wait-up.sh
|
||||||
- docker-compose -f docker-compose.ci.yml logs
|
- docker-compose -f docker-compose.ci.yml --env-file .env.test logs
|
||||||
- docker exec -t v3-user sh -c "npm run test"
|
- docker exec -t v3-user sh -c "npm run test"
|
||||||
rules:
|
rules:
|
||||||
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_MESSAGE =~ /--check/ || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
|
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_MESSAGE =~ /--check/ || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
|
||||||
|
|
Loading…
Reference in New Issue