From 189f42413dba89c270dc20beb540daf4d65e9e3a Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 22 Oct 2018 11:44:31 -0400 Subject: [PATCH 01/10] add build artifact to CI build --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f363231e415..693d2fd3601 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,6 +33,9 @@ jobs: command: | npm run pretest npm run cibuild + - run: + name: Save build artifact + command: cp build/plotly.js $CIRCLE_ARTIFACTS/ - save_cache: paths: - node_modules From 057816086ceb7afbd92d2263db8bb626239770f3 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 22 Oct 2018 11:59:44 -0400 Subject: [PATCH 02/10] update to circleci v2 api for artifacts --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 693d2fd3601..510b7070da1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,6 +33,8 @@ jobs: command: | npm run pretest npm run cibuild + - store_artifacts: + path: ~/plotly.js/build/plotly.js - run: name: Save build artifact command: cp build/plotly.js $CIRCLE_ARTIFACTS/ From 8a8bbecbe5448bd26ed14cee197f6b1537a634dd Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 22 Oct 2018 12:07:30 -0400 Subject: [PATCH 03/10] remove outdated circleci build artifact syntax --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 510b7070da1..31e870817d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,9 +35,6 @@ jobs: npm run cibuild - store_artifacts: path: ~/plotly.js/build/plotly.js - - run: - name: Save build artifact - command: cp build/plotly.js $CIRCLE_ARTIFACTS/ - save_cache: paths: - node_modules From 243ed88612c2861184ce3227a109bd597782b8ec Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 22 Oct 2018 15:36:06 -0400 Subject: [PATCH 04/10] change plotly.js artifact destination --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 31e870817d9..6f6aace60db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,8 @@ jobs: npm run pretest npm run cibuild - store_artifacts: - path: ~/plotly.js/build/plotly.js + path: build/plotly.js + destination: /plotly.js - save_cache: paths: - node_modules From d1806f8bbcdb0540ded9bc53d28c8778d41ac203 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 22 Oct 2018 19:19:06 -0400 Subject: [PATCH 05/10] store artifacts as last build step for easy retrieval with CircleCI API --- .circleci/config.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f6aace60db..c632ae53726 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,9 +33,6 @@ jobs: command: | npm run pretest npm run cibuild - - store_artifacts: - path: build/plotly.js - destination: /plotly.js - save_cache: paths: - node_modules @@ -123,6 +120,19 @@ jobs: name: Run syntax tests command: ./.circleci/test.sh syntax + publish: + working_directory: ~/plotly.js + steps: + - store_artifacts: + path: build/plotly.js + destination: /plotly.js + - store_artifacts: + path: dist/plotly.min.js + destinatin: /plotly.min.js + - store_artifacts: + path: dist/plot-schema.json + destination: /plot-schema.json + workflows: version: 2 build-and-test: @@ -143,3 +153,6 @@ workflows: - test-syntax: requires: - build + - publish: + requires: + - build From d02ce90bf88e424d619cf83d52180602e27ca0db Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 22 Oct 2018 19:23:12 -0400 Subject: [PATCH 06/10] specify executor --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c632ae53726..f374145a7ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -121,6 +121,8 @@ jobs: command: ./.circleci/test.sh syntax publish: + docker: + - image: circleci/node:10.9.0 working_directory: ~/plotly.js steps: - store_artifacts: From d54cf1aee5cb9f2380cd1016bd96d56015c4f6dc Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 22 Oct 2018 19:29:52 -0400 Subject: [PATCH 07/10] properly checkout and attach to workspace --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f374145a7ba..b2c49eb99a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -122,9 +122,12 @@ jobs: publish: docker: - - image: circleci/node:10.9.0 + - image: circleci/node:10.9.0 working_directory: ~/plotly.js steps: + - checkout + - attach_workspace: + at: ~/plotly.js - store_artifacts: path: build/plotly.js destination: /plotly.js From bb9886e421d463bd94e9693b8b18a2886893d55e Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 22 Oct 2018 19:57:44 -0400 Subject: [PATCH 08/10] fix typo in circleci config, make sure publish is the lastest build step --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b2c49eb99a3..6e01bbe16fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -133,7 +133,7 @@ jobs: destination: /plotly.js - store_artifacts: path: dist/plotly.min.js - destinatin: /plotly.min.js + destination: /plotly.min.js - store_artifacts: path: dist/plot-schema.json destination: /plot-schema.json From 3ebfa04923c9814defdf09c819035d16654ef629 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 22 Oct 2018 20:02:36 -0400 Subject: [PATCH 09/10] fix to make sure publish is last step --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e01bbe16fe..3320583130d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -160,4 +160,8 @@ workflows: - build - publish: requires: - - build + - test-jasmine + - test-jasmine2 + - test-image + - test-image2 + - test-syntax From 82b640b08ed912563b765f791f1a82be61b75391 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 22 Oct 2018 21:12:07 -0400 Subject: [PATCH 10/10] move test-image artifacts to root --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3320583130d..af9b0439074 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,6 +88,7 @@ jobs: command: ./.circleci/test.sh image - store_artifacts: path: build + destination: / test-image2: docker: @@ -107,6 +108,7 @@ jobs: command: ./.circleci/test.sh image2 - store_artifacts: path: build + destination: / test-syntax: docker: