test ci --check
This commit is contained in:
parent
cacf0a3132
commit
5c8f0af6a9
|
@ -26,26 +26,9 @@ integration-test:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
script:
|
script:
|
||||||
- docker-compose -f docker-compose.ci.yml --env-file ci/.env.ci up -d
|
- docker-compose -f docker-compose.ci.yml --env-file ci/.env.ci up -d
|
||||||
- sleep 30
|
- sh ci/wait-up.sh
|
||||||
- docker-compose -f docker-compose.ci.yml --env-file ci/.env.ci logs
|
- docker-compose -f docker-compose.ci.yml --env-file ci/.env.ci logs
|
||||||
- docker exec -t v3-user sh -c "npm run test:integration:ci"
|
- docker exec -t v3-user sh -c "npm run test:integration:ci"
|
||||||
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'
|
||||||
when: always
|
when: always
|
||||||
|
|
||||||
# test-api-dev:
|
|
||||||
# stage: test
|
|
||||||
# image: docker/compose:latest
|
|
||||||
# variables:
|
|
||||||
# DOCKER_TLS_CERTDIR: ""
|
|
||||||
# services:
|
|
||||||
# - docker:dind
|
|
||||||
# script:
|
|
||||||
# - docker-compose -f docker-compose.ci.yml --env-file ci/.env.ci up -d
|
|
||||||
# - sleep 30
|
|
||||||
# - docker exec -t v3-user sh -c "npm run test:integration"
|
|
||||||
# - docker-compose -f docker-compose.ci.yml --env-file ci/.env.ci logs
|
|
||||||
# - docker exec -t v3-user sh -c "npm run test:integration"
|
|
||||||
# rules:
|
|
||||||
# - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_MESSAGE =~ /--check/ || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
|
|
||||||
# when: always
|
|
||||||
|
|
|
@ -16,10 +16,11 @@ RUN npm ci
|
||||||
# Bundle app source
|
# Bundle app source
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
|
# Generate prisma client
|
||||||
RUN npx prisma generate
|
RUN npx prisma generate
|
||||||
|
|
||||||
# Creates a "dist" folder
|
# Create a "dist" folder
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
# Start the server using the production build
|
# Start the server
|
||||||
CMD [ "node", "dist/main.js" ]
|
CMD [ "node", "dist/main.js" ]
|
||||||
|
|
Loading…
Reference in New Issue