From a903e8eade2abd3caeb941a05cb98ceecea848f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Wed, 26 Jul 2017 16:25:28 +0800 Subject: [PATCH 01/11] chore(travis): jobs --- .nvmrc | 2 +- .travis.yml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.nvmrc b/.nvmrc index ac2895c59..2b0aa2121 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -8.1.4 +8.2.1 diff --git a/.travis.yml b/.travis.yml index e4e6912cb..d5f00c577 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,11 @@ before_install: curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION fi -script: - - yarn run danger - - ./tasks/test.sh - - ./tasks/test-page.sh +jobs: + include: + - script: yarn run danger + - script: ./tasks/test.sh + - script: ./tasks/test-page.sh after_success: - ./node_modules/.bin/codecov @@ -27,6 +28,6 @@ after_success: cache: yarn: true directories: - - ~/.yarn + - $HOME/.yarn - node_modules - packages/mcs-lite-introduction/node_modules From 45fb04d7a191bf4a394c62db13bf300992fc2d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Wed, 26 Jul 2017 16:38:28 +0800 Subject: [PATCH 02/11] update --- .circleci/config.yml | 6 ++---- .travis.yml | 11 ++++++++--- tasks/lint.sh | 10 ++++++++++ tasks/test.sh | 8 -------- 4 files changed, 20 insertions(+), 15 deletions(-) create mode 100755 tasks/lint.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index acfd8cc83..5594a0402 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,16 +71,14 @@ jobs: steps: - *attach_workspace - *restore_from_workspace - - run: yarn run eslint - - run: yarn run flow - - run: yarn run stylelint + - run: ./tasks/lint.sh # For unit testing of all packages. test: <<: *docker_default steps: - *attach_workspace - *restore_from_workspace - - run: node_modules/.bin/lerna run test + - run: ./tasks/test.sh # For building demo page. test-page: <<: *docker_default diff --git a/.travis.yml b/.travis.yml index d5f00c577..00d6d4627 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,14 @@ before_install: jobs: include: - - script: yarn run danger - - script: ./tasks/test.sh - - script: ./tasks/test-page.sh + - stage: yarn run danger + script: yarn run danger + - stage: ./tasks/lint.sh + script: ./tasks/lint.sh + - stage: ./tasks/test.sh + script: ./tasks/test.sh + - stage: ./tasks/test-page.sh + script: ./tasks/test-page.sh after_success: - ./node_modules/.bin/codecov diff --git a/tasks/lint.sh b/tasks/lint.sh new file mode 100755 index 000000000..5524468ad --- /dev/null +++ b/tasks/lint.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -e + +echo -e '\n\n================================================='; +echo -e '| 1. 💪 💪 💪 Start global linting'; +echo -e '=================================================\n\n'; +yarn run eslint +yarn run stylelint +yarn run flow diff --git a/tasks/test.sh b/tasks/test.sh index d5e42e20e..e59ca869b 100755 --- a/tasks/test.sh +++ b/tasks/test.sh @@ -2,14 +2,6 @@ set -e -echo -e '\n\n================================================='; -echo -e '| 1. 💪 💪 💪 Start global linting'; -echo -e '=================================================\n\n'; -yarn run eslint -yarn run stylelint -yarn run flow - - echo -e '\n\n================================================='; echo -e '| 2. 🚐 🚐 🚐 Run test interface for each packages'; echo -e '=================================================\n\n'; From 512a7e5b01b57a3794c337c8d72064db9c989eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Wed, 26 Jul 2017 16:44:09 +0800 Subject: [PATCH 03/11] update --- .travis.yml | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00d6d4627..c01ea1044 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,21 +18,18 @@ before_install: jobs: include: - - stage: yarn run danger + - stage: Test script: yarn run danger - - stage: ./tasks/lint.sh script: ./tasks/lint.sh - - stage: ./tasks/test.sh script: ./tasks/test.sh - - stage: ./tasks/test-page.sh script: ./tasks/test-page.sh - -after_success: - - ./node_modules/.bin/codecov - -cache: - yarn: true - directories: - - $HOME/.yarn - - node_modules - - packages/mcs-lite-introduction/node_modules + - stage: Success + script: skip + after_success: + - ./node_modules/.bin/codecov + cache: + yarn: true + directories: + - $HOME/.yarn + - node_modules + - packages/mcs-lite-introduction/node_modules From a3fa286ec64fe1e55bbb3c44a94549c8facf8393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Wed, 26 Jul 2017 16:45:35 +0800 Subject: [PATCH 04/11] update --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c01ea1044..35ccdaa1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,11 +18,10 @@ before_install: jobs: include: - - stage: Test - script: yarn run danger - script: ./tasks/lint.sh - script: ./tasks/test.sh - script: ./tasks/test-page.sh + - script: yarn run danger + - script: ./tasks/lint.sh + - script: ./tasks/test.sh + - script: ./tasks/test-page.sh - stage: Success script: skip after_success: From 3903ee5a33aeb8d35bfcc026b6bd75d5b8f3589c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Wed, 26 Jul 2017 16:52:21 +0800 Subject: [PATCH 05/11] update --- .travis.yml | 15 ++++++++++++--- README.md | 3 +++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35ccdaa1e..152cd3ffc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,13 +19,22 @@ before_install: jobs: include: - script: yarn run danger + env: + - TRAVIS_JOB_NAME=danger - script: ./tasks/lint.sh + env: + - TRAVIS_JOB_NAME=lint - script: ./tasks/test.sh - - script: ./tasks/test-page.sh - - stage: Success - script: skip + env: + - TRAVIS_JOB_NAME=test after_success: - ./node_modules/.bin/codecov + - script: ./tasks/test-page.sh + env: + - TRAVIS_JOB_NAME=test-page + - script: skip + env: + - TRAVIS_JOB_NAME=cache cache: yarn: true directories: diff --git a/README.md b/README.md index 81beaef47..9ea7366c7 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,10 @@ $ ./tasks/build.sh ## Testing ``` +$ yarn run format +$ ./tasks/lint.sh $ ./tasks/test.sh +$ ./tasks/test-page.sh ``` ## mcs-lite-ui From d41d38f2c525688fae6bdb9688cbfd71e2ca047d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Thu, 27 Jul 2017 09:32:44 +0800 Subject: [PATCH 06/11] update --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 152cd3ffc..215e66050 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,16 @@ before_install: curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION fi +install: + - echo "none" + jobs: include: - - script: yarn run danger + - stage: Install Dependencies + script: | + yarn install + - stage: Test + script: yarn run danger env: - TRAVIS_JOB_NAME=danger - script: ./tasks/lint.sh From 0c53473a9a21edb8443c545555611d1cf10de200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Thu, 27 Jul 2017 09:39:48 +0800 Subject: [PATCH 07/11] update --- .travis.yml | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 215e66050..c2c22a593 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,30 +21,23 @@ install: jobs: include: - - stage: Install Dependencies + - stage: Install Dependencies and Cache script: | - yarn install - - stage: Test - script: yarn run danger - env: - - TRAVIS_JOB_NAME=danger - - script: ./tasks/lint.sh - env: - - TRAVIS_JOB_NAME=lint - - script: ./tasks/test.sh - env: - - TRAVIS_JOB_NAME=test - after_success: - - ./node_modules/.bin/codecov - - script: ./tasks/test-page.sh - env: - - TRAVIS_JOB_NAME=test-page - - script: skip - env: - - TRAVIS_JOB_NAME=cache + yarn install --pure-lockfile + pwd cache: yarn: true directories: - $HOME/.yarn - node_modules - packages/mcs-lite-introduction/node_modules + + - stage: Test + script: | + yarn run danger + pwd + - script: ./tasks/lint.sh + - script: ./tasks/test-page.sh + - script: ./tasks/test.sh + after_success: + - ./node_modules/.bin/codecov From 207d66bc02188e9d6fecb237ba36887f6b8d1ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Thu, 27 Jul 2017 09:45:09 +0800 Subject: [PATCH 08/11] update --- .travis.yml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2c22a593..edea86f32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,6 @@ env: global: - YARN_VERSION=0.27.5 -notifications: - email: evenchange4@gmail.com - before_install: - export PATH="$HOME/.yarn/bin:$PATH" - | @@ -21,23 +18,23 @@ install: jobs: include: + # Prepare npm and cache - stage: Install Dependencies and Cache - script: | - yarn install --pure-lockfile - pwd + script: yarn install --pure-lockfile cache: yarn: true directories: - $HOME/.yarn - node_modules - - packages/mcs-lite-introduction/node_modules + # Use cache - stage: Test - script: | - yarn run danger - pwd - - script: ./tasks/lint.sh - - script: ./tasks/test-page.sh - - script: ./tasks/test.sh + script: yarn run danger + - script: yarn run postinstall && ./tasks/lint.sh + - script: yarn run postinstall && ./tasks/test-page.sh + - script: yarn run postinstall && ./tasks/test.sh after_success: - ./node_modules/.bin/codecov + +notifications: + email: evenchange4@gmail.com From 2a08757a88ec19f3f5832b4b72bb1d9a1f60ae3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Thu, 27 Jul 2017 09:51:13 +0800 Subject: [PATCH 09/11] update --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index edea86f32..a701550f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,20 +16,20 @@ before_install: install: - echo "none" +cache: + yarn: true + directories: + - $HOME/.yarn + - node_modules + jobs: include: - # Prepare npm and cache + # Prepare npm and Warm up cache - stage: Install Dependencies and Cache script: yarn install --pure-lockfile - cache: - yarn: true - directories: - - $HOME/.yarn - - node_modules - # Use cache - stage: Test - script: yarn run danger + script: yarn run danger - script: yarn run postinstall && ./tasks/lint.sh - script: yarn run postinstall && ./tasks/test-page.sh - script: yarn run postinstall && ./tasks/test.sh From d006b24c23f262c8be7708996c71d6c2e245f8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Thu, 27 Jul 2017 10:07:25 +0800 Subject: [PATCH 10/11] update --- .travis.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index a701550f8..c344d42d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,12 @@ sudo: false -language: node_js -node_js: - - "8.2.1" -env: - global: - - YARN_VERSION=0.27.5 +services: + - docker before_install: - - export PATH="$HOME/.yarn/bin:$PATH" - - | - if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION - fi + - docker pull node:8.2.1 install: - - echo "none" + - echo "[Skip] Use job stage to warm up cache" cache: yarn: true From 50f3a61991ae58c004def0d49f613c9ce1e6fe94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Hsu=20=28=E5=BE=90=E6=89=BF=E5=BF=97=29?= Date: Thu, 27 Jul 2017 11:13:38 +0800 Subject: [PATCH 11/11] update --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c344d42d4..90459ad3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: false +language: node_js services: - docker