From 13e6f6603e08a09e154076489004598001db8170 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Tue, 14 Mar 2017 17:39:09 +0100
Subject: [PATCH] Updated ci-config for the webpack build

---
 .gitlab-ci.yml | 42 ++++--------------------------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d521dd4..09fe991 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,43 +15,21 @@ build_job:
   stage: build
   script:
     - npm install
-    - npm run tsc
+    - npm run build
   tags:
     - javascript
   except:
     - tags
   artifacts:
     paths:
-      - app/*.css
-      - app/*.html
-      - app/*.js
-      - app/*.js.map
-      - app/converter/*.js
-      - app/converter/*.js.map
-      - node_modules/@angular/
-      - node_modules/core-js/client/shim.js
-      - node_modules/zone.js/dist/zone.js
-      - node_modules/reflect-metadata/Reflect.js
-      - node_modules/rxjs/
-      - node_modules/systemjs/dist/system.src.js
-      - node_modules/utf8/utf8.js
-      - node_modules/quoted-printable/quoted-printable.js
-      - node_modules/punycode/punycode.js
-      - abeezee-regular.woff
-      - freemono.eot
-      - freemono.svg
-      - freemono.ttf
-      - freemono.woff
-      - index.html
-      - package.json
-      - systemjs.config.js
+      - dist
     expire_in: 30 min
 
 cleanup_build_job:
   stage: cleanup_build
   script:
     - rm -rf node_modules
-    - rm -rf typings
+    - rm -rf dist
   when: on_failure
 
 pages:
@@ -61,19 +39,7 @@ pages:
     - tags
     - master
   script:
-    - mkdir -p public/{app/converter,node_modules/{@angular,core-js/client,zone.js/dist,reflect-metadata,rxjs,systemjs/dist,utf8,quoted-printable,punycode}}
-    - cp -a index.html abeezee-regular.woff freemono.* package.json systemjs.config.js public/
-    - cp -a app/*.css app/*.html app/*.js app/*.js.map public/app/
-    - cp -a app/converter/*.js app/converter/*.js.map public/app/converter/
-    - cp -a node_modules/@angular/* public/node_modules/@angular/
-    - cp -a node_modules/core-js/client/shim.js public/node_modules/core-js/client/
-    - cp -a node_modules/zone.js/dist/zone.js public/node_modules/zone.js/dist/
-    - cp -a node_modules/reflect-metadata/Reflect.js public/node_modules/reflect-metadata/
-    - cp -a node_modules/rxjs/* public/node_modules/rxjs/
-    - cp -a node_modules/systemjs/dist/system.src.js public/node_modules/systemjs/dist/
-    - cp -a node_modules/utf8/utf8.js public/node_modules/utf8/
-    - cp -a node_modules/quoted-printable/quoted-printable.js public/node_modules/quoted-printable/
-    - cp -a node_modules/punycode/punycode.js public/node_modules/punycode/
+    - mv dist public
   artifacts:
     paths:
       - public