From 41fd153991fb1e324664cd27b9c2d4aca8a4f408 Mon Sep 17 00:00:00 2001 From: Baptiste Lemoine Date: Sat, 31 Oct 2020 16:12:44 +0100 Subject: [PATCH] :hammer: test the build with gitlab CI --- .gitlab-ci.yml | 55 +++++++++---------- .../stepper/stepper.component.html | 10 ---- src/environments/environment.prod.ts | 1 + src/environments/environment.ts | 1 + 4 files changed, 29 insertions(+), 38 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4837d81f..cf5f74c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,8 @@ image: node:latest stages: - - pages + - build +# - pages - test # - e2e @@ -10,38 +11,36 @@ cache: paths: - node_modules/ -pages: - stage: pages - script: - - yarn install --pure-lockfile - - yarn build:prod:gitlabpage - - mv dist/framadate/ public/ - artifacts: - paths: - - public - expire_in: '2 hours' - only: - - develop +#pages: +# stage: pages +# script: +# - yarn install --pure-lockfile +# - yarn build:prod:gitlabpage +# - mv dist/framadate/ public/ +# artifacts: +# paths: +# - public +# expire_in: '2 hours' +# only: +# - develop -test: - stage: test - script: - - npm i - - pkill Xvfb - - npm run test:ci - artifacts: - paths: - - coverage/ - cache: - policy: pull +#test: +# stage: test +# script: +# - npm i +# - pkill Xvfb +# - npm run test:ci +# artifacts: +# paths: +# - coverage/ +# cache: +# policy: pull -test-build: - stage: test +build: + stage: build script: - yarn install --pure-lockfile - npx ng build --prod - only: - - master cache: policy: pull diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html index 268af8f0..00d5d761 100644 --- a/src/app/features/administration/stepper/stepper.component.html +++ b/src/app/features/administration/stepper/stepper.component.html @@ -5,16 +5,6 @@ Titre - diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 9d2793cc..605f23be 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -6,6 +6,7 @@ const backendApiUrlsInDev = { export const environment = { production: true, appTitle: 'FramaDate', + appVersion: '2.0.0', appLogo: '/assets/img/logo.png', api: { baseHref: backendApiUrlsInDev.remote, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index a29db50d..b403d0d7 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -10,6 +10,7 @@ const backendApiUrlsInDev = { export const environment = { production: false, appTitle: 'FramaDate', + appVersion: '2.0.0', appLogo: 'assets/img/logo.png', api: { baseHref: backendApiUrlsInDev.local,