From 7dacfcbff261fa027f5141ae5c96a84cc0227db9 Mon Sep 17 00:00:00 2001
From: "bhill6@wisc.edu" <bhill6@wisc.edu>
Date: Wed, 24 Oct 2018 19:00:23 +0000
Subject: [PATCH] added deploy-url arg to CI ng build

---
 .gitlab-ci.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc9970d..0dd4f4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: docker.doit.wisc.edu/registrar/angular-cli-builder:1.2.0
+image: docker.doit.wisc.edu/registrar/angular-cli-builder:1.1.0
 
 
 variables:
@@ -7,30 +7,31 @@ variables:
 
 stages:
   - build
-#  - test
+  - test
   - deploy
 
 build:
   stage: build
   script:
     - npm install
-    - ng build --prod --base-href /degree-planner
-    - ng lint
+    - ng build --prod --base-href /degree-planner --deploy-url /degree-planner/
 
-#test:
-#  stage: test
-#  script:
-#  - npm install
-#  - ng build --prod
+test:
+  stage: test
+  script:
+  - npm install
+  - ng build --prod
+  - npm test
+  - npm lint
 
 
 deploy:
   stage: deploy
   script:
     - npm install
-    - ng build --prod --base-href  /degree-planner
+    - ng build --prod --base-href /degree-planner --deploy-url /degree-planner/
     - aws s3 sync --acl public-read --sse --delete dist/course-search-enroll-fe s3://$S3_BUCKET_NAME
     - aws configure set preview.cloudfront true
     - aws cloudfront create-invalidation --distribution-id $DEV_CFDIST_ID --paths '/*'
   only:
-    - master@adi-ia/course-search-enroll-fe
+    - master
-- 
GitLab