Commit cf3e95f0 authored by Matthieu FAURE's avatar Matthieu FAURE

Merge branch 'develop' into 37-install-documentation

# Conflicts:
#	package.json
parents 7854fcc2 384cf554
Pipeline #6315 passed with stages
in 9 minutes and 21 seconds
......@@ -9,7 +9,8 @@
"outDir": "dist",
"assets": [
"assets",
"favicon.ico"
"favicon.ico",
"Logo_FEDER.png"
],
"index": "index.html",
"main": "main.ts",
......
# Select image from https://hub.docker.com/_/node/
image: node:6
image: node:10
stages:
- syntax
- build
- tests
# Select what we should cache
cache:
......@@ -12,11 +17,19 @@ before_script:
- npm install
lint:
stage: 'syntax'
script:
- ng lint
build:
stage: 'build'
script:
- ng build
- ng build --prod
artifacts:
paths:
- dist
expire_in: 30 days
name: "e-collectivite-angular-client-$CI_COMMIT_REF_SLUG"
test:
stage: 'tests'
script:
- ng test --browsers PhantomJS --watch=false --code-coverage
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment