From e0d98e73e3fc2cc909b21892da3ac7f5b6d1a05e Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 27 Mar 2018 14:08:20 -0700 Subject: [PATCH 1/5] Revert "Revert "Ci - introduce a build job"" --- .circleci/config.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ebf569a5..f812767ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,6 +6,9 @@ workflows: jobs: - prep-deps-npm - prep-deps-firefox + - build: + requires: + - prep-deps-npm - prep-scss: requires: - prep-deps-npm @@ -217,3 +220,17 @@ jobs: - run: name: test:integration:mascara command: npm run test:mascara + + build: + docker: + - image: circleci/node:8-browsers + steps: + - checkout + - restore_cache: + key: dependency-cache-{{ checksum "package-lock.json" }} + - run: + name: build:dist + command: npm run dist + - run: + name: build:debug + command: find dist/ -type f -exec md5sum {} \; | sort -k 2 From 62e1cbd33b440b8dcb98446b2fdee3f66ab5c1ad Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 27 Mar 2018 14:16:58 -0700 Subject: [PATCH 2/5] ci - run e2e tests after build step --- .circleci/config.yml | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f812767ad..ed6dc7802 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ workflows: jobs: - prep-deps-npm - prep-deps-firefox - - build: + - prep-build: requires: - prep-deps-npm - prep-scss: @@ -17,6 +17,7 @@ workflows: - prep-deps-npm - test-e2e: requires: + - prep-build - prep-deps-npm - test-unit: requires: @@ -71,6 +72,23 @@ jobs: paths: - firefox + prep-build: + docker: + - image: circleci/node:8-browsers + steps: + - checkout + - restore_cache: + key: dependency-cache-{{ checksum "package-lock.json" }} + - run: + name: build:dist + command: npm run dist + - run: + name: build:debug + command: find dist/ -type f -exec md5sum {} \; | sort -k 2 + - save_cache: + key: build-cache-{{ .Revision }} + paths: + - dist prep-scss: docker: @@ -109,9 +127,8 @@ jobs: - checkout - restore_cache: key: dependency-cache-{{ checksum "package-lock.json" }} - - run: - name: Build - command: npm run dist + - restore_cache: + key: build-cache-{{ .Revision }} - run: name: Test command: npm run test:e2e @@ -220,17 +237,3 @@ jobs: - run: name: test:integration:mascara command: npm run test:mascara - - build: - docker: - - image: circleci/node:8-browsers - steps: - - checkout - - restore_cache: - key: dependency-cache-{{ checksum "package-lock.json" }} - - run: - name: build:dist - command: npm run dist - - run: - name: build:debug - command: find dist/ -type f -exec md5sum {} \; | sort -k 2 From 1dea4124f5e5b5eb37c234321808e9d414865f30 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 27 Mar 2018 14:40:04 -0700 Subject: [PATCH 3/5] ci - end by flowing all required tests into a single job --- .circleci/config.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed6dc7802..dadbf4885 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,6 +40,15 @@ workflows: - prep-deps-npm - prep-deps-firefox - prep-scss + - all-tests-passed: + requires: + - test-lint + - test-unit + - test-e2e + - test-integration-mascara-chrome + - test-integration-mascara-firefox + - test-integration-flat-chrome + - test-integration-flat-firefox jobs: prep-deps-npm: @@ -237,3 +246,10 @@ jobs: - run: name: test:integration:mascara command: npm run test:mascara + +all-tests-pass: + docker: + - image: circleci/node:8-browsers + - run: + name: All Tests Passed + command: echo 'weew - everything passed!' From 3ec3b09c12618c40a0769605893626e059c64fc1 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 27 Mar 2018 16:09:11 -0700 Subject: [PATCH 4/5] ci - end by flowing all required tests into a single job --- .circleci/config.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dadbf4885..a8e18116c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,7 +40,7 @@ workflows: - prep-deps-npm - prep-deps-firefox - prep-scss - - all-tests-passed: + - all-tests-pass: requires: - test-lint - test-unit @@ -247,9 +247,10 @@ jobs: name: test:integration:mascara command: npm run test:mascara -all-tests-pass: - docker: - - image: circleci/node:8-browsers - - run: - name: All Tests Passed - command: echo 'weew - everything passed!' + all-tests-pass: + docker: + - image: circleci/node:8-browsers + steps: + - run: + name: All Tests Passed + command: echo 'weew - everything passed!' From fe8472ab22fbff8d679943f0c65efd5d66c2a9c7 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 27 Mar 2018 16:10:27 -0700 Subject: [PATCH 5/5] ci - end by flowing all required tests into a single job --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a8e18116c..75819fc6e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -252,5 +252,5 @@ jobs: - image: circleci/node:8-browsers steps: - run: - name: All Tests Passed - command: echo 'weew - everything passed!' + name: All Tests Passed + command: echo 'weew - everything passed!'