Merge remote-tracking branch 'origin/master'

This commit is contained in:
Marco Zeisler 2021-05-11 23:00:17 +02:00
commit 0e35fc6441

View File

@ -17,16 +17,25 @@ stages:
######## ########
# BUILD # BUILD
################################################################# #################################################################
#build_fe:
# image: node:alpine
# script:
# - echo ''
# extends:
# - .build
.build: .build:
stage: build stage: build
build_fe:
image: node:alpine
script:
- cd ./frontend
- npm install
cache:
key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR
paths:
- node_modules/
only:
changes:
- package-lock.json
extends:
- .build
build_be: build_be:
before_script: before_script:
- apt-get update - apt-get update
@ -56,8 +65,16 @@ lint_fe:
extends: extends:
- .lint - .lint
- .angular-image - .angular-image
# needs: cache:
# - build_fe key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR
paths:
- node_modules/
policy: pull-push
only:
changes:
- package-lock.json
needs:
- build_fe
#lint_be: #lint_be:
# script: # script:
@ -77,8 +94,12 @@ test_fe:
script: script:
- cd ./frontend - cd ./frontend
- npm update - npm update
- npm install puppeteer --only=dev # for chrome headless
- ng test - ng test
cache:
key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR
paths:
- node_modules/
policy: pull
extends: extends:
- .test - .test
- .angular-image - .angular-image