From aaca959ee0bcf12bacaba450945258eac7643437 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 20:48:43 +0900 Subject: [PATCH 01/16] change circle ci settings --- .circleci/config.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b0c95b2..788f8fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,18 +1,26 @@ version: 2 jobs: build: + working_directory: ~/angular-cli-circleci docker: - image: circleci/node:7.10-browsers - working_directory: ~/repo steps: - checkout - restore_cache: - keys: - - v1-dependencies-{{ checksum "package.json" }} - - v1-dependencies- - - run: npm install + key: dependencies-{{ checksum "package.json" }} + - run: + name: install + command: npm install - save_cache: + key: dependencies-{{ checksum "package.json" }} paths: - - node_modules - key: v1-dependencies-{{ checksum "package.json" }} - - run: karma start ./karma.conf.js --single-run + - ./node_modules + - run: + name: build + command: ng build --aot --prod + - run: + name: test + command: karma start ./karma.conf.js --single-run + - run: + name: lint + command: ng lint From e74ffa7dc59bd16d37e30edc97ccaa39ca08c4ee Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:05:20 +0900 Subject: [PATCH 02/16] fix circle ci settings --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 788f8fd..d0a5a4a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,9 @@ jobs: key: dependencies-{{ checksum "package.json" }} - run: name: install - command: npm install + command: + - npm install + - npm install angular-cli@latest -g - save_cache: key: dependencies-{{ checksum "package.json" }} paths: From a0a15232fc05670d85051fc0bb97782d89443ad8 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:09:29 +0900 Subject: [PATCH 03/16] fix circle ci settings --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d0a5a4a..f484bd0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,9 +9,12 @@ jobs: - restore_cache: key: dependencies-{{ checksum "package.json" }} - run: - name: install + name: install npm command: - npm install + - run: + name: install angular-cli + command: - npm install angular-cli@latest -g - save_cache: key: dependencies-{{ checksum "package.json" }} From 1a84a8d5e0db818e6969eb7969a4dacb648fc269 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:11:47 +0900 Subject: [PATCH 04/16] fix circle ci settings --- .circleci/config.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f484bd0..d5dfd73 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,13 +9,8 @@ jobs: - restore_cache: key: dependencies-{{ checksum "package.json" }} - run: - name: install npm - command: - - npm install - - run: - name: install angular-cli - command: - - npm install angular-cli@latest -g + name: install + command: npm install angular-cli@latest -g && npm install - save_cache: key: dependencies-{{ checksum "package.json" }} paths: From 270be7b023511f2eb59af71c51d61f3850391495 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:16:07 +0900 Subject: [PATCH 05/16] fix circle ci settings --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d5dfd73..c3093b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: key: dependencies-{{ checksum "package.json" }} - run: name: install - command: npm install angular-cli@latest -g && npm install + command: npm install -g @angular/cli && npm install - save_cache: key: dependencies-{{ checksum "package.json" }} paths: From 645443bdf81c5a6a2f1784ecec05d42059bb4e7f Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:19:06 +0900 Subject: [PATCH 06/16] fix circle ci settings --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c3093b9..0e31f6b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,17 +10,17 @@ jobs: key: dependencies-{{ checksum "package.json" }} - run: name: install - command: npm install -g @angular/cli && npm install + command: npm install - save_cache: key: dependencies-{{ checksum "package.json" }} paths: - ./node_modules - run: name: build - command: ng build --aot --prod + command: npm run ng build --aot --prod - run: name: test - command: karma start ./karma.conf.js --single-run + command: npm run karma start ./karma.conf.js --single-run - run: name: lint - command: ng lint + command: npm run ng lint From 3d41f3cd8c328e9b720e5ffdcfe2d16dc0f74145 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:22:24 +0900 Subject: [PATCH 07/16] change cli version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c4c074..d9fbbac 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "private": true, "dependencies": { "@angular/animations": "^5.0.0", - "@angular/cli": "1.6.3", + "@angular/cli": "^1.6.3", "@angular/common": "^5.0.0", "@angular/compiler": "^5.0.0", "@angular/compiler-cli": "^5.0.0", From 16d68a4a8458354e185c1df5ea1dd58c46fe6e5b Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:26:13 +0900 Subject: [PATCH 08/16] change build settings --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e31f6b..a6fe21e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,18 +9,18 @@ jobs: - restore_cache: key: dependencies-{{ checksum "package.json" }} - run: - name: install + name: Install command: npm install - save_cache: key: dependencies-{{ checksum "package.json" }} paths: - ./node_modules - run: - name: build + name: Build command: npm run ng build --aot --prod - run: - name: test - command: npm run karma start ./karma.conf.js --single-run - - run: - name: lint + name: Lint command: npm run ng lint + - run: + name: Test + command: karma start ./karma.conf.js --single-run From f33d3880451956c509c612d23d3c87105ee3fb71 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:35:28 +0900 Subject: [PATCH 09/16] change build settings --- .circleci/config.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6fe21e..761ca5c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,8 +19,13 @@ jobs: name: Build command: npm run ng build --aot --prod - run: - name: Lint - command: npm run ng lint + name: Running X virtual framebuffer + command: Xvfb :99 -screen 0 1280x1024x24 + background: true - run: name: Test command: karma start ./karma.conf.js --single-run + - run: + name: Lint + command: npm run ng lint + From d758e87c0c164abbcab08eb52320aebdc5d2c569 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:37:18 +0900 Subject: [PATCH 10/16] change build settings --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 761ca5c..21cb6e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,10 +18,6 @@ jobs: - run: name: Build command: npm run ng build --aot --prod - - run: - name: Running X virtual framebuffer - command: Xvfb :99 -screen 0 1280x1024x24 - background: true - run: name: Test command: karma start ./karma.conf.js --single-run From d79b5859d9430678c0b7cee437a9eda17fcdc407 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:52:10 +0900 Subject: [PATCH 11/16] add deploy settings --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 21cb6e0..dfd5cb5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,9 +19,8 @@ jobs: name: Build command: npm run ng build --aot --prod - run: - name: Test - command: karma start ./karma.conf.js --single-run + name: Deploy + command: aws s3 sync dist s3://angular-sandbox/ --include "*" --acl public-read --cache-control "max-age=3600" --delete - run: name: Lint command: npm run ng lint - From 0148dcee83fbf81ef0bc81f5aab7637dbb9e8975 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:56:09 +0900 Subject: [PATCH 12/16] fix deploy settings --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dfd5cb5..cf4f7c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,6 @@ jobs: command: npm run ng build --aot --prod - run: name: Deploy - command: aws s3 sync dist s3://angular-sandbox/ --include "*" --acl public-read --cache-control "max-age=3600" --delete - - run: - name: Lint - command: npm run ng lint + command: | + apt-get install awscli + aws s3 sync dist s3://angular-sandbox/ --include "*" --acl public-read --cache-control "max-age=3600" --delete From 701ed779e9027564cd30cf8ae503ca9381851d48 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Sun, 18 Feb 2018 21:58:13 +0900 Subject: [PATCH 13/16] fix deploy settings --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf4f7c2..67d7d78 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,5 +21,5 @@ jobs: - run: name: Deploy command: | - apt-get install awscli + sudo apt-get install awscli aws s3 sync dist s3://angular-sandbox/ --include "*" --acl public-read --cache-control "max-age=3600" --delete From 9f99bb2797a93baf342fbe602a5b24297bc10c1f Mon Sep 17 00:00:00 2001 From: cloudliner Date: Mon, 19 Feb 2018 09:20:39 +0900 Subject: [PATCH 14/16] awscli install --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 67d7d78..5ca4641 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,5 +21,5 @@ jobs: - run: name: Deploy command: | - sudo apt-get install awscli + pip install awscli --upgrade --user aws s3 sync dist s3://angular-sandbox/ --include "*" --acl public-read --cache-control "max-age=3600" --delete From 641645a7203d07f4c78c8bad60547cfe4edd32c8 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Mon, 19 Feb 2018 09:23:46 +0900 Subject: [PATCH 15/16] awscli install --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ca4641..fa8e2c9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,5 +21,9 @@ jobs: - run: name: Deploy command: | + apt-get -y -qq update + apt-get -y -qq install python3.4-dev + curl -O https://bootstrap.pypa.io/get-pip.py + python3.4 get-pip.py --user pip install awscli --upgrade --user aws s3 sync dist s3://angular-sandbox/ --include "*" --acl public-read --cache-control "max-age=3600" --delete From 8d53fa30ab9242f72f54128bc6a5a5dc11295883 Mon Sep 17 00:00:00 2001 From: cloudliner Date: Tue, 6 Mar 2018 01:53:24 +0900 Subject: [PATCH 16/16] fix build setting --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa8e2c9..1047bcd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ jobs: - ./node_modules - run: name: Build - command: npm run ng build --aot --prod + command: npm run ng build -- --aot --prod - run: name: Deploy command: |