From bf8942aef4cbf95af503a2aaf5c132c6326c3219 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 11:12:33 -0700 Subject: [PATCH 01/55] Setting up after_success for travisci --- .travis.yml | 2 ++ package.json | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 11d23f84c1..621453e812 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,3 +30,5 @@ env: - TEST_DIR=modules/primer-truncate - TEST_DIR=modules/primer-utilities script: cd $TEST_DIR && npm install && npm test +after_success: + "npm run devbuild" diff --git a/package.json b/package.json index 5d47f9539a..93481ad22d 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "skipgit": "lerna publish --skip-git", "dev": "lerna publish --npm-tag=dev", "rc": "lerna publish --npm-tag=rc", - "force": "lerna publish --force-publish=*" + "force": "lerna publish --force-publish=*", + "devbuild": "echo '👻'" }, "devDependencies": { "lerna": "^2.0.0-rc.5" From 2e44d06204b9c31627ede20f5ad8326e4af25a6f Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 11:16:04 -0700 Subject: [PATCH 02/55] removing quotes --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 621453e812..fc72264807 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,5 +30,4 @@ env: - TEST_DIR=modules/primer-truncate - TEST_DIR=modules/primer-utilities script: cd $TEST_DIR && npm install && npm test -after_success: - "npm run devbuild" +after_success: npm run devbuild From a5727207aa85b28a60694689ab14f6be61e8d120 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 11:29:23 -0700 Subject: [PATCH 03/55] testing with deploy script --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fc72264807..40a54b597d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,4 +30,8 @@ env: - TEST_DIR=modules/primer-truncate - TEST_DIR=modules/primer-utilities script: cd $TEST_DIR && npm install && npm test -after_success: npm run devbuild +deploy: + provider: npm + script: npm run devbuild + except: + - master From 9ce110dbe59f1803c86ae5b71cdb5456ad610f8d Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 11:35:41 -0700 Subject: [PATCH 04/55] Change provider to script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 40a54b597d..f3dc0ecdd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ env: - TEST_DIR=modules/primer-utilities script: cd $TEST_DIR && npm install && npm test deploy: - provider: npm + provider: script script: npm run devbuild except: - master From 50e6f4c9a2b3bf30dec7259c8abf70d7ae179d12 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 13:10:22 -0700 Subject: [PATCH 05/55] trying with an extra env --- .travis.yml | 1 + package.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f3dc0ecdd0..09df171018 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: node_js node_js: - '7' env: + - TEST_DIR=. - TEST_DIR=modules/primer-css - TEST_DIR=modules/primer-core - TEST_DIR=modules/primer-product diff --git a/package.json b/package.json index 93481ad22d..fc7744d877 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "dev": "lerna publish --npm-tag=dev", "rc": "lerna publish --npm-tag=rc", "force": "lerna publish --force-publish=*", - "devbuild": "echo '👻'" + "devbuild": "echo '👻'", + "test": "echo '🎃'" }, "devDependencies": { "lerna": "^2.0.0-rc.5" From fa38af4503544d406141162bbf1c61e4249e0c2d Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 13:13:44 -0700 Subject: [PATCH 06/55] on all branches --- .travis.yml | 5 ++--- package.json | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09df171018..2f91b5e97c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: node_js node_js: - '7' env: - - TEST_DIR=. - TEST_DIR=modules/primer-css - TEST_DIR=modules/primer-core - TEST_DIR=modules/primer-product @@ -34,5 +33,5 @@ script: cd $TEST_DIR && npm install && npm test deploy: provider: script script: npm run devbuild - except: - - master + on: + all_branches: true diff --git a/package.json b/package.json index fc7744d877..4c7d99d6a3 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,7 @@ "dev": "lerna publish --npm-tag=dev", "rc": "lerna publish --npm-tag=rc", "force": "lerna publish --force-publish=*", - "devbuild": "echo '👻'", - "test": "echo '🎃'" + "devbuild": "echo '👻' & echo cwd" }, "devDependencies": { "lerna": "^2.0.0-rc.5" From a20f259327e9161595e62a81a158b7a001ee8d5c Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 13:28:36 -0700 Subject: [PATCH 07/55] Change to the build directory --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f91b5e97c..3858234f5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,6 @@ env: script: cd $TEST_DIR && npm install && npm test deploy: provider: script - script: npm run devbuild + script: cd $TRAVIS_BUILD_DIR && npm run devbuild on: all_branches: true From 29e2566dfccc011e1f44ac8cc1a8d5b95a14aaa6 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 13:34:24 -0700 Subject: [PATCH 08/55] Constructing version name --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3858234f5e..06df94ea41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,6 @@ env: script: cd $TEST_DIR && npm install && npm test deploy: provider: script - script: cd $TRAVIS_BUILD_DIR && npm run devbuild + script: cd $TRAVIS_BUILD_DIR && echo "$(npm show primer-css version)-commit.$TRAVIS_COMMIT" on: all_branches: true From bdc537f41fd98e9a48345d67182cb62ca1399d69 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 13:35:50 -0700 Subject: [PATCH 09/55] removing npm script for now --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 4c7d99d6a3..5d47f9539a 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,7 @@ "skipgit": "lerna publish --skip-git", "dev": "lerna publish --npm-tag=dev", "rc": "lerna publish --npm-tag=rc", - "force": "lerna publish --force-publish=*", - "devbuild": "echo '👻' & echo cwd" + "force": "lerna publish --force-publish=*" }, "devDependencies": { "lerna": "^2.0.0-rc.5" From a41446a53c96c325a586a09382249c2aecf93bea Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 13:46:42 -0700 Subject: [PATCH 10/55] Using short commit --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 06df94ea41..8c0f2331ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: node_js node_js: - '7' env: + global: + - COMMIT=${TRAVIS_COMMIT::8} - TEST_DIR=modules/primer-css - TEST_DIR=modules/primer-core - TEST_DIR=modules/primer-product @@ -32,6 +34,6 @@ env: script: cd $TEST_DIR && npm install && npm test deploy: provider: script - script: cd $TRAVIS_BUILD_DIR && echo "$(npm show primer-css version)-commit.$TRAVIS_COMMIT" + script: cd $TRAVIS_BUILD_DIR && echo "$(npm show primer-css version)-commit.$COMMIT" on: all_branches: true From 8f443ab786b66d05708a090ce681ee1aaa498ff2 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 13:49:44 -0700 Subject: [PATCH 11/55] Using matrix --- .travis.yml | 55 +++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c0f2331ab..25c15a53bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,33 +4,34 @@ node_js: env: global: - COMMIT=${TRAVIS_COMMIT::8} - - TEST_DIR=modules/primer-css - - TEST_DIR=modules/primer-core - - TEST_DIR=modules/primer-product - - TEST_DIR=modules/primer-marketing - - TEST_DIR=modules/primer-alerts - - TEST_DIR=modules/primer-base - - TEST_DIR=modules/primer-blankslate - - TEST_DIR=modules/primer-box - - TEST_DIR=modules/primer-breadcrumb - - TEST_DIR=modules/primer-buttons - - TEST_DIR=modules/primer-cards - - TEST_DIR=modules/primer-forms - - TEST_DIR=modules/primer-labels - - TEST_DIR=modules/primer-layout - - TEST_DIR=modules/primer-markdown - - TEST_DIR=modules/primer-marketing - - TEST_DIR=modules/primer-marketing-type - - TEST_DIR=modules/primer-marketing-utilities - - TEST_DIR=modules/primer-navigation - - TEST_DIR=modules/primer-page-headers - - TEST_DIR=modules/primer-page-sections - - TEST_DIR=modules/primer-support - - TEST_DIR=modules/primer-table-object - - TEST_DIR=modules/primer-tables - - TEST_DIR=modules/primer-tooltips - - TEST_DIR=modules/primer-truncate - - TEST_DIR=modules/primer-utilities + matrix: + - TEST_DIR=modules/primer-css + - TEST_DIR=modules/primer-core + - TEST_DIR=modules/primer-product + - TEST_DIR=modules/primer-marketing + - TEST_DIR=modules/primer-alerts + - TEST_DIR=modules/primer-base + - TEST_DIR=modules/primer-blankslate + - TEST_DIR=modules/primer-box + - TEST_DIR=modules/primer-breadcrumb + - TEST_DIR=modules/primer-buttons + - TEST_DIR=modules/primer-cards + - TEST_DIR=modules/primer-forms + - TEST_DIR=modules/primer-labels + - TEST_DIR=modules/primer-layout + - TEST_DIR=modules/primer-markdown + - TEST_DIR=modules/primer-marketing + - TEST_DIR=modules/primer-marketing-type + - TEST_DIR=modules/primer-marketing-utilities + - TEST_DIR=modules/primer-navigation + - TEST_DIR=modules/primer-page-headers + - TEST_DIR=modules/primer-page-sections + - TEST_DIR=modules/primer-support + - TEST_DIR=modules/primer-table-object + - TEST_DIR=modules/primer-tables + - TEST_DIR=modules/primer-tooltips + - TEST_DIR=modules/primer-truncate + - TEST_DIR=modules/primer-utilities script: cd $TEST_DIR && npm install && npm test deploy: provider: script From c1b119af514dbe33dfda4124144f0cbc67614303 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 13:55:18 -0700 Subject: [PATCH 12/55] Abstracting out module name --- .travis.yml | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25c15a53bc..f7a7a67f6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,36 +5,36 @@ env: global: - COMMIT=${TRAVIS_COMMIT::8} matrix: - - TEST_DIR=modules/primer-css - - TEST_DIR=modules/primer-core - - TEST_DIR=modules/primer-product - - TEST_DIR=modules/primer-marketing - - TEST_DIR=modules/primer-alerts - - TEST_DIR=modules/primer-base - - TEST_DIR=modules/primer-blankslate - - TEST_DIR=modules/primer-box - - TEST_DIR=modules/primer-breadcrumb - - TEST_DIR=modules/primer-buttons - - TEST_DIR=modules/primer-cards - - TEST_DIR=modules/primer-forms - - TEST_DIR=modules/primer-labels - - TEST_DIR=modules/primer-layout - - TEST_DIR=modules/primer-markdown - - TEST_DIR=modules/primer-marketing - - TEST_DIR=modules/primer-marketing-type - - TEST_DIR=modules/primer-marketing-utilities - - TEST_DIR=modules/primer-navigation - - TEST_DIR=modules/primer-page-headers - - TEST_DIR=modules/primer-page-sections - - TEST_DIR=modules/primer-support - - TEST_DIR=modules/primer-table-object - - TEST_DIR=modules/primer-tables - - TEST_DIR=modules/primer-tooltips - - TEST_DIR=modules/primer-truncate - - TEST_DIR=modules/primer-utilities -script: cd $TEST_DIR && npm install && npm test + - MODULE=primer-css + - MODULE=primer-core + - MODULE=primer-product + - MODULE=primer-marketing + - MODULE=primer-alerts + - MODULE=primer-base + - MODULE=primer-blankslate + - MODULE=primer-box + - MODULE=primer-breadcrumb + - MODULE=primer-buttons + - MODULE=primer-cards + - MODULE=primer-forms + - MODULE=primer-labels + - MODULE=primer-layout + - MODULE=primer-markdown + - MODULE=primer-marketing + - MODULE=primer-marketing-type + - MODULE=primer-marketing-utilities + - MODULE=primer-navigation + - MODULE=primer-page-headers + - MODULE=primer-page-sections + - MODULE=primer-support + - MODULE=primer-table-object + - MODULE=primer-tables + - MODULE=primer-tooltips + - MODULE=primer-truncate + - MODULE=primer-utilities +script: cd modules/$MODULE && npm install && npm test deploy: provider: script - script: cd $TRAVIS_BUILD_DIR && echo "$(npm show primer-css version)-commit.$COMMIT" + script: cd $TRAVIS_BUILD_DIR && echo "$(npm show $MODULE version)-commit.$COMMIT" on: all_branches: true From 570b6678cea00ab00c8080dc350dc65dd29e6313 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 14:11:37 -0700 Subject: [PATCH 13/55] Creating a deploy matrix --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f7a7a67f6a..957d41a5be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,9 +32,11 @@ env: - MODULE=primer-tooltips - MODULE=primer-truncate - MODULE=primer-utilities + - MODULE=..;DEPLOY=true script: cd modules/$MODULE && npm install && npm test deploy: provider: script - script: cd $TRAVIS_BUILD_DIR && echo "$(npm show $MODULE version)-commit.$COMMIT" + script: cd $TRAVIS_BUILD_DIR && echo "-commit.$COMMIT" on: all_branches: true + condition: "$DEPLOY = true" From 5bb405972ed4fabf93aa5f7ddada2f29e422781f Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 14:19:44 -0700 Subject: [PATCH 14/55] Don't deploy on dev or master --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 957d41a5be..3a6a125bd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,4 +39,4 @@ deploy: script: cd $TRAVIS_BUILD_DIR && echo "-commit.$COMMIT" on: all_branches: true - condition: "$DEPLOY = true" + condition: "$DEPLOY = true && $TRAVIS_PULL_REQUEST_BRANCH != master && $TRAVIS_PULL_REQUEST_BRANCH != dev" From 7613846dd11f8c388fb46d034a1e8000bd822950 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 14:23:21 -0700 Subject: [PATCH 15/55] let's do this --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a6a125bd2..414829ae60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ env: script: cd modules/$MODULE && npm install && npm test deploy: provider: script - script: cd $TRAVIS_BUILD_DIR && echo "-commit.$COMMIT" + script: cd $TRAVIS_BUILD_DIR && lerna publish --canary=commit --cd-version=patch on: all_branches: true condition: "$DEPLOY = true && $TRAVIS_PULL_REQUEST_BRANCH != master && $TRAVIS_PULL_REQUEST_BRANCH != dev" From 95aac5b11b1ae3ef442bff694994277713bcdbe9 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 14:26:23 -0700 Subject: [PATCH 16/55] removing global commit variable and installing dev dependencies --- .travis.yml | 61 +++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 414829ae60..e852dc17d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,41 +2,38 @@ language: node_js node_js: - '7' env: - global: - - COMMIT=${TRAVIS_COMMIT::8} - matrix: - - MODULE=primer-css - - MODULE=primer-core - - MODULE=primer-product - - MODULE=primer-marketing - - MODULE=primer-alerts - - MODULE=primer-base - - MODULE=primer-blankslate - - MODULE=primer-box - - MODULE=primer-breadcrumb - - MODULE=primer-buttons - - MODULE=primer-cards - - MODULE=primer-forms - - MODULE=primer-labels - - MODULE=primer-layout - - MODULE=primer-markdown - - MODULE=primer-marketing - - MODULE=primer-marketing-type - - MODULE=primer-marketing-utilities - - MODULE=primer-navigation - - MODULE=primer-page-headers - - MODULE=primer-page-sections - - MODULE=primer-support - - MODULE=primer-table-object - - MODULE=primer-tables - - MODULE=primer-tooltips - - MODULE=primer-truncate - - MODULE=primer-utilities - - MODULE=..;DEPLOY=true + - MODULE=primer-css + - MODULE=primer-core + - MODULE=primer-product + - MODULE=primer-marketing + - MODULE=primer-alerts + - MODULE=primer-base + - MODULE=primer-blankslate + - MODULE=primer-box + - MODULE=primer-breadcrumb + - MODULE=primer-buttons + - MODULE=primer-cards + - MODULE=primer-forms + - MODULE=primer-labels + - MODULE=primer-layout + - MODULE=primer-markdown + - MODULE=primer-marketing + - MODULE=primer-marketing-type + - MODULE=primer-marketing-utilities + - MODULE=primer-navigation + - MODULE=primer-page-headers + - MODULE=primer-page-sections + - MODULE=primer-support + - MODULE=primer-table-object + - MODULE=primer-tables + - MODULE=primer-tooltips + - MODULE=primer-truncate + - MODULE=primer-utilities + - MODULE=..;DEPLOY=true script: cd modules/$MODULE && npm install && npm test deploy: provider: script - script: cd $TRAVIS_BUILD_DIR && lerna publish --canary=commit --cd-version=patch + script: cd $TRAVIS_BUILD_DIR && npm install && lerna publish --canary=commit --cd-version=patch on: all_branches: true condition: "$DEPLOY = true && $TRAVIS_PULL_REQUEST_BRANCH != master && $TRAVIS_PULL_REQUEST_BRANCH != dev" From b8d7aebcc2943ebc9d24010c52ce828e8ca8cd83 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 14:30:54 -0700 Subject: [PATCH 17/55] Running script --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e852dc17d2..b26d2626e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,8 @@ env: script: cd modules/$MODULE && npm install && npm test deploy: provider: script - script: cd $TRAVIS_BUILD_DIR && npm install && lerna publish --canary=commit --cd-version=patch + skip_cleanup: true + script: cd $TRAVIS_BUILD_DIR && script/dev-deploy on: all_branches: true - condition: "$DEPLOY = true && $TRAVIS_PULL_REQUEST_BRANCH != master && $TRAVIS_PULL_REQUEST_BRANCH != dev" + condition: "$DEPLOY = true" From b482fd832006f8318aeca1cfeca3245a99e31138 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 14:44:35 -0700 Subject: [PATCH 18/55] Sort these so we don't overlook any --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b26d2626e2..eb818cecdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,6 @@ language: node_js node_js: - '7' env: - - MODULE=primer-css - - MODULE=primer-core - - MODULE=primer-product - - MODULE=primer-marketing - MODULE=primer-alerts - MODULE=primer-base - MODULE=primer-blankslate @@ -13,16 +9,20 @@ env: - MODULE=primer-breadcrumb - MODULE=primer-buttons - MODULE=primer-cards + - MODULE=primer-core + - MODULE=primer-css - MODULE=primer-forms - MODULE=primer-labels - MODULE=primer-layout - MODULE=primer-markdown - MODULE=primer-marketing + - MODULE=primer-marketing - MODULE=primer-marketing-type - MODULE=primer-marketing-utilities - MODULE=primer-navigation - MODULE=primer-page-headers - MODULE=primer-page-sections + - MODULE=primer-product - MODULE=primer-support - MODULE=primer-table-object - MODULE=primer-tables From 610e213152fd63bbc78d83a99f0b4ead585970b4 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 14:45:52 -0700 Subject: [PATCH 19/55] creating a dummy script to avoid failed deploy --- script/dev-deploy | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 script/dev-deploy diff --git a/script/dev-deploy b/script/dev-deploy new file mode 100644 index 0000000000..ae0368f31a --- /dev/null +++ b/script/dev-deploy @@ -0,0 +1,3 @@ +#!/bin/sh + +echo '🤡🎈 They all float down here.' From 79cf276d7924a7b87a7c9ec197e7b39827775ac1 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 14:48:40 -0700 Subject: [PATCH 20/55] Changing permissions on script --- script/dev-deploy | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 script/dev-deploy diff --git a/script/dev-deploy b/script/dev-deploy old mode 100644 new mode 100755 From af83807aa5302090b8bbe287ba11cb1cca8e03dc Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Fri, 7 Jul 2017 15:21:26 -0700 Subject: [PATCH 21/55] update publish scripts --- package.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5d47f9539a..29f8730d63 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,9 @@ "clean": "lerna clean", "updated": "lerna updated", "diff": "lerna diff", - "publish": "lerna publish", - "skipgit": "lerna publish --skip-git", - "dev": "lerna publish --npm-tag=dev", - "rc": "lerna publish --npm-tag=rc", - "force": "lerna publish --force-publish=*" + "publish": "lerna publish --skip-git", + "publish-rc": "npm run publish -- --npm-tag=rc", + "publish-canary": "npm run publish -- --canary=commit --cd-version=patch" }, "devDependencies": { "lerna": "^2.0.0-rc.5" From 2b16f69fd322105db5b6c4909732b9ca37c43dfe Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Fri, 7 Jul 2017 15:21:37 -0700 Subject: [PATCH 22/55] add top-level test script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 29f8730d63..3ab8d04e4f 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "diff": "lerna diff", "publish": "lerna publish --skip-git", "publish-rc": "npm run publish -- --npm-tag=rc", - "publish-canary": "npm run publish -- --canary=commit --cd-version=patch" + "publish-canary": "npm run publish -- --canary=commit --cd-version=patch", + "test": "lerna run test" }, "devDependencies": { "lerna": "^2.0.0-rc.5" From e5a115e811605185356826c401ff2c82d70f1ef7 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Fri, 7 Jul 2017 15:22:03 -0700 Subject: [PATCH 23/55] just echo for now --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ab8d04e4f..a03ce5076f 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "clean": "lerna clean", "updated": "lerna updated", "diff": "lerna diff", - "publish": "lerna publish --skip-git", + "publish": "echo lerna publish --skip-git", "publish-rc": "npm run publish -- --npm-tag=rc", "publish-canary": "npm run publish -- --canary=commit --cd-version=patch", "test": "lerna run test" From 2f202820d65bf4b081c25d25c5a4fb034313b200 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Fri, 7 Jul 2017 15:22:22 -0700 Subject: [PATCH 24/55] add basic branch logic --- script/dev-deploy | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/script/dev-deploy b/script/dev-deploy index ae0368f31a..6e39f6d7e0 100755 --- a/script/dev-deploy +++ b/script/dev-deploy @@ -1,3 +1,8 @@ #!/bin/sh - -echo '🤡🎈 They all float down here.' +if [[ $BRANCH = master ]]; + npm run publish +elif [[ $BRANCH = dev ]]; + npm run publish-rc +else + npm run publish-canary +fi From 14c5ecbfb6d19034f1213fe800000a79fee7adae Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Fri, 7 Jul 2017 15:43:38 -0700 Subject: [PATCH 25/55] rename 'publish' => 'release'; don't run recursively --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a03ce5076f..ee62e5d640 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "clean": "lerna clean", "updated": "lerna updated", "diff": "lerna diff", - "publish": "echo lerna publish --skip-git", - "publish-rc": "npm run publish -- --npm-tag=rc", - "publish-canary": "npm run publish -- --canary=commit --cd-version=patch", + "release": "lerna publish --skip-git", + "release-candidate": "lerna publish --skip-git --npm-tag=rc", + "release-canary": "lerna publish --skip-git --canary=commit --cd-version=patch", "test": "lerna run test" }, "devDependencies": { From 908ab0e3365b325f8d3ef7df3c8bf7263572bbac Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Fri, 7 Jul 2017 15:45:04 -0700 Subject: [PATCH 26/55] stub out CI deployment logic --- script/dev-deploy | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/script/dev-deploy b/script/dev-deploy index 6e39f6d7e0..3dabc71957 100755 --- a/script/dev-deploy +++ b/script/dev-deploy @@ -1,8 +1,17 @@ #!/bin/sh -if [[ $BRANCH = master ]]; - npm run publish -elif [[ $BRANCH = dev ]]; - npm run publish-rc +set -e +# always publish a canary release if this is a PR build +if [[ $TRAVIS_PULL_REQUEST && $TRAVIS_PULL_REQUEST != false ]]; then + echo "🐦 Publishing canary version..." + echo npm run release-canary +# merges to dev build a release candidate +elif [[ $TRAVIS_BRANCH = release ]]; then + echo "👌 Publishing release candidate..." + echo npm run release-candidate +elif [[ $TRAVIS_BRANCH = master ]]; then + echo "📦 Publishing latest release!" + echo npm run release else - npm run publish-canary + echo "⚠️ This isn't a PR and '${TRAVIS_BRANCH}' isn't a release branch." + exit 1 fi From 172f6c247c6fea1cb5c03936980b64e517db26ee Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Fri, 7 Jul 2017 15:49:42 -0700 Subject: [PATCH 27/55] remove top-level test script for now --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index ee62e5d640..a9820abe19 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,7 @@ "diff": "lerna diff", "release": "lerna publish --skip-git", "release-candidate": "lerna publish --skip-git --npm-tag=rc", - "release-canary": "lerna publish --skip-git --canary=commit --cd-version=patch", - "test": "lerna run test" + "release-canary": "lerna publish --skip-git --canary=commit --cd-version=patch" }, "devDependencies": { "lerna": "^2.0.0-rc.5" From 88a0b4e22f8b03eb6718f8c2a6ea1e4855d4ca9f Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 15:57:10 -0700 Subject: [PATCH 28/55] rename to deploy --- .travis.yml | 2 +- script/dev-deploy | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100755 script/dev-deploy diff --git a/.travis.yml b/.travis.yml index eb818cecdf..26abfa62a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: cd modules/$MODULE && npm install && npm test deploy: provider: script skip_cleanup: true - script: cd $TRAVIS_BUILD_DIR && script/dev-deploy + script: cd $TRAVIS_BUILD_DIR && script/deploy on: all_branches: true condition: "$DEPLOY = true" diff --git a/script/dev-deploy b/script/dev-deploy deleted file mode 100755 index 3dabc71957..0000000000 --- a/script/dev-deploy +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -e -# always publish a canary release if this is a PR build -if [[ $TRAVIS_PULL_REQUEST && $TRAVIS_PULL_REQUEST != false ]]; then - echo "🐦 Publishing canary version..." - echo npm run release-canary -# merges to dev build a release candidate -elif [[ $TRAVIS_BRANCH = release ]]; then - echo "👌 Publishing release candidate..." - echo npm run release-candidate -elif [[ $TRAVIS_BRANCH = master ]]; then - echo "📦 Publishing latest release!" - echo npm run release -else - echo "⚠️ This isn't a PR and '${TRAVIS_BRANCH}' isn't a release branch." - exit 1 -fi From a4d63922a4f6977b95d73fe98da4f222c3307ef8 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 15:57:33 -0700 Subject: [PATCH 29/55] rename to deploy --- script/deploy | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 script/deploy diff --git a/script/deploy b/script/deploy new file mode 100755 index 0000000000..3dabc71957 --- /dev/null +++ b/script/deploy @@ -0,0 +1,17 @@ +#!/bin/sh +set -e +# always publish a canary release if this is a PR build +if [[ $TRAVIS_PULL_REQUEST && $TRAVIS_PULL_REQUEST != false ]]; then + echo "🐦 Publishing canary version..." + echo npm run release-canary +# merges to dev build a release candidate +elif [[ $TRAVIS_BRANCH = release ]]; then + echo "👌 Publishing release candidate..." + echo npm run release-candidate +elif [[ $TRAVIS_BRANCH = master ]]; then + echo "📦 Publishing latest release!" + echo npm run release +else + echo "⚠️ This isn't a PR and '${TRAVIS_BRANCH}' isn't a release branch." + exit 1 +fi From 999c6d4372c2bc48a220d1e0a6a01a574980096a Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 16:00:22 -0700 Subject: [PATCH 30/55] skipping deploy --- .travis.yml | 8 +------- script/deploy | 7 ++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 26abfa62a3..10226f348f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,4 @@ env: - MODULE=primer-utilities - MODULE=..;DEPLOY=true script: cd modules/$MODULE && npm install && npm test -deploy: - provider: script - skip_cleanup: true - script: cd $TRAVIS_BUILD_DIR && script/deploy - on: - all_branches: true - condition: "$DEPLOY = true" +after_success: cd $TRAVIS_BUILD_DIR && script/deploy diff --git a/script/deploy b/script/deploy index 3dabc71957..39959140b0 100755 --- a/script/deploy +++ b/script/deploy @@ -1,8 +1,13 @@ #!/bin/sh set -e +if [[ $DEPLOY != true ]]; then + echo "Skipping deploy." + exit 1 +fi + # always publish a canary release if this is a PR build if [[ $TRAVIS_PULL_REQUEST && $TRAVIS_PULL_REQUEST != false ]]; then - echo "🐦 Publishing canary version..." + echo "🐦 Publishing canary version..." echo npm run release-canary # merges to dev build a release candidate elif [[ $TRAVIS_BRANCH = release ]]; then From 65925c338c3557ccf6904b24a848a1791b3678a3 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Fri, 7 Jul 2017 16:12:07 -0700 Subject: [PATCH 31/55] add back npm test script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a9820abe19..ee62e5d640 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "diff": "lerna diff", "release": "lerna publish --skip-git", "release-candidate": "lerna publish --skip-git --npm-tag=rc", - "release-canary": "lerna publish --skip-git --canary=commit --cd-version=patch" + "release-canary": "lerna publish --skip-git --canary=commit --cd-version=patch", + "test": "lerna run test" }, "devDependencies": { "lerna": "^2.0.0-rc.5" From 89ba9a09404940f6518c9b103e220ad8cea08b1b Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Fri, 7 Jul 2017 16:12:17 -0700 Subject: [PATCH 32/55] try testing from top level --- .travis.yml | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10226f348f..894274437d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1,10 @@ language: node_js node_js: - - '7' -env: - - MODULE=primer-alerts - - MODULE=primer-base - - MODULE=primer-blankslate - - MODULE=primer-box - - MODULE=primer-breadcrumb - - MODULE=primer-buttons - - MODULE=primer-cards - - MODULE=primer-core - - MODULE=primer-css - - MODULE=primer-forms - - MODULE=primer-labels - - MODULE=primer-layout - - MODULE=primer-markdown - - MODULE=primer-marketing - - MODULE=primer-marketing - - MODULE=primer-marketing-type - - MODULE=primer-marketing-utilities - - MODULE=primer-navigation - - MODULE=primer-page-headers - - MODULE=primer-page-sections - - MODULE=primer-product - - MODULE=primer-support - - MODULE=primer-table-object - - MODULE=primer-tables - - MODULE=primer-tooltips - - MODULE=primer-truncate - - MODULE=primer-utilities - - MODULE=..;DEPLOY=true -script: cd modules/$MODULE && npm install && npm test -after_success: cd $TRAVIS_BUILD_DIR && script/deploy + - 7 + +script: + - lerna bootstrap + - npm test + +after_success: + - script/deploy From 4abd9bdc182022749aba45073063b9ececc8e16c Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 19:59:11 -0700 Subject: [PATCH 33/55] try bash --- script/deploy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/script/deploy b/script/deploy index 39959140b0..d7a9918648 100755 --- a/script/deploy +++ b/script/deploy @@ -1,9 +1,5 @@ -#!/bin/sh +#!/bin/bash set -e -if [[ $DEPLOY != true ]]; then - echo "Skipping deploy." - exit 1 -fi # always publish a canary release if this is a PR build if [[ $TRAVIS_PULL_REQUEST && $TRAVIS_PULL_REQUEST != false ]]; then From cf82ee4110e4ea57cbc0fbee6face9f72b23a3f9 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 7 Jul 2017 20:04:01 -0700 Subject: [PATCH 34/55] Use travis event type --- script/deploy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/deploy b/script/deploy index d7a9918648..5d877eb9ef 100755 --- a/script/deploy +++ b/script/deploy @@ -2,7 +2,7 @@ set -e # always publish a canary release if this is a PR build -if [[ $TRAVIS_PULL_REQUEST && $TRAVIS_PULL_REQUEST != false ]]; then +if [[ $TRAVIS_EVENT_TYPE = pull_request ]]; then echo "🐦 Publishing canary version..." echo npm run release-canary # merges to dev build a release candidate From 4bb84f88a51159470fcd32c1490c7bf2f57119c1 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Mon, 10 Jul 2017 15:31:41 -0700 Subject: [PATCH 35/55] rename deploy => cibuild --- .travis.yml | 6 ++++-- script/{deploy => cibuild} | 0 2 files changed, 4 insertions(+), 2 deletions(-) rename script/{deploy => cibuild} (100%) diff --git a/.travis.yml b/.travis.yml index 894274437d..5de3576548 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,11 @@ language: node_js node_js: - 7 -script: +before_script: - lerna bootstrap + +script: - npm test after_success: - - script/deploy + - script/cibuild diff --git a/script/deploy b/script/cibuild similarity index 100% rename from script/deploy rename to script/cibuild From 03d2e1f221b5f6d33619c88b5a9ae84c7b25cb22 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Mon, 10 Jul 2017 15:48:41 -0700 Subject: [PATCH 36/55] run all ci release commands with --yes --- script/cibuild | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/script/cibuild b/script/cibuild index 5d877eb9ef..6fdb0daf9b 100755 --- a/script/cibuild +++ b/script/cibuild @@ -1,17 +1,20 @@ #!/bin/bash set -e +ci_args=-- --yes + # always publish a canary release if this is a PR build if [[ $TRAVIS_EVENT_TYPE = pull_request ]]; then echo "🐦 Publishing canary version..." - echo npm run release-canary + npm run release-canary ${ci_args} # merges to dev build a release candidate -elif [[ $TRAVIS_BRANCH = release ]]; then +elif [[ $TRAVIS_BRANCH = dev ]]; then echo "👌 Publishing release candidate..." - echo npm run release-candidate + npm run release-candidate ${ci_args} +# publish a release when we merge to master elif [[ $TRAVIS_BRANCH = master ]]; then echo "📦 Publishing latest release!" - echo npm run release + npm run release ${ci_args} else echo "⚠️ This isn't a PR and '${TRAVIS_BRANCH}' isn't a release branch." exit 1 From e18e8f7ccf0ec5b864b88683820f32f9c8d90b68 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Mon, 10 Jul 2017 15:50:46 -0700 Subject: [PATCH 37/55] remove --skip-git lerna arg --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index ee62e5d640..13284fe9ef 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,11 @@ "scripts": { "bootstrap": "lerna bootstrap", "clean": "lerna clean", - "updated": "lerna updated", "diff": "lerna diff", - "release": "lerna publish --skip-git", - "release-candidate": "lerna publish --skip-git --npm-tag=rc", - "release-canary": "lerna publish --skip-git --canary=commit --cd-version=patch", + "updated": "lerna updated", + "release": "lerna publish", + "release-candidate": "lerna publish --npm-tag=rc", + "release-canary": "lerna publish --canary=commit --cd-version=patch", "test": "lerna run test" }, "devDependencies": { From 0a07d2f4dcf4ddd31aa43593d4c5aea3f8f396ec Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Mon, 10 Jul 2017 15:50:58 -0700 Subject: [PATCH 38/55] upgrade to lerna@2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 13284fe9ef..25727e4e34 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,6 @@ "test": "lerna run test" }, "devDependencies": { - "lerna": "^2.0.0-rc.5" + "lerna": "^2.0.0" } } From e99ae79a67ff5eb81fb6fa6b01c9a3d18b02d732 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Tue, 11 Jul 2017 13:08:08 -0700 Subject: [PATCH 39/55] authenticate npm w/NPM_TOKEN env --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5de3576548..e26635d371 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,5 @@ script: - npm test after_success: + - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc - script/cibuild From c3abddce04035776e95bcf3516a4291d41a57676 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Tue, 11 Jul 2017 13:08:48 -0700 Subject: [PATCH 40/55] call script/cibuild with --yes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e26635d371..02a06d2077 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,4 @@ script: after_success: - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc - - script/cibuild + - script/cibuild --yes From f40a30c032372ef6682aa78e71725ce9e9283646 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Tue, 11 Jul 2017 13:09:27 -0700 Subject: [PATCH 41/55] get ci_args from argv[1:] --- script/cibuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/cibuild b/script/cibuild index 6fdb0daf9b..3738b7fd9a 100755 --- a/script/cibuild +++ b/script/cibuild @@ -1,20 +1,20 @@ #!/bin/bash set -e -ci_args=-- --yes +ci_args=${@:1} # always publish a canary release if this is a PR build if [[ $TRAVIS_EVENT_TYPE = pull_request ]]; then echo "🐦 Publishing canary version..." - npm run release-canary ${ci_args} + npm run release-canary -- ${ci_args} # merges to dev build a release candidate elif [[ $TRAVIS_BRANCH = dev ]]; then echo "👌 Publishing release candidate..." - npm run release-candidate ${ci_args} + npm run release-candidate -- ${ci_args} # publish a release when we merge to master elif [[ $TRAVIS_BRANCH = master ]]; then echo "📦 Publishing latest release!" - npm run release ${ci_args} + npm run release -- ${ci_args} else echo "⚠️ This isn't a PR and '${TRAVIS_BRANCH}' isn't a release branch." exit 1 From 0d3f6b74582b81377a1afef8451c9624f9facd8e Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Tue, 11 Jul 2017 13:09:43 -0700 Subject: [PATCH 42/55] rename ci_args to args --- script/cibuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/cibuild b/script/cibuild index 3738b7fd9a..840cc5b153 100755 --- a/script/cibuild +++ b/script/cibuild @@ -1,20 +1,20 @@ #!/bin/bash set -e -ci_args=${@:1} +args=${@:1} # always publish a canary release if this is a PR build if [[ $TRAVIS_EVENT_TYPE = pull_request ]]; then echo "🐦 Publishing canary version..." - npm run release-canary -- ${ci_args} + npm run release-canary -- ${args} # merges to dev build a release candidate elif [[ $TRAVIS_BRANCH = dev ]]; then echo "👌 Publishing release candidate..." - npm run release-candidate -- ${ci_args} + npm run release-candidate -- ${args} # publish a release when we merge to master elif [[ $TRAVIS_BRANCH = master ]]; then echo "📦 Publishing latest release!" - npm run release -- ${ci_args} + npm run release -- ${args} else echo "⚠️ This isn't a PR and '${TRAVIS_BRANCH}' isn't a release branch." exit 1 From 9cce630a770f1cf3f28d0a7bcae98cdc4db63746 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Tue, 11 Jul 2017 13:23:48 -0700 Subject: [PATCH 43/55] use NPM_API_KEY instead of NPM_TOKEN --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 02a06d2077..dbb4eb117b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,5 @@ script: - npm test after_success: - - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc + - echo "//registry.npmjs.org/:_authToken=\${NPM_API_KEY}" > .npmrc - script/cibuild --yes From d96aa3bdb87044db7dd5741d9cf94cb7806d743f Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 13:43:09 -0700 Subject: [PATCH 44/55] set --npm-tag=canary for release-canary script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25727e4e34..bfa19e2b35 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "updated": "lerna updated", "release": "lerna publish", "release-candidate": "lerna publish --npm-tag=rc", - "release-canary": "lerna publish --canary=commit --cd-version=patch", + "release-canary": "lerna publish --canary --npm-tag=canary", "test": "lerna run test" }, "devDependencies": { From 92656aa4ec2572bcd799bec74d2ed74422fbe729 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 13:43:31 -0700 Subject: [PATCH 45/55] add a comment to explain why we're passing args --- script/cibuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/cibuild b/script/cibuild index 840cc5b153..315be2b65c 100755 --- a/script/cibuild +++ b/script/cibuild @@ -1,6 +1,8 @@ #!/bin/bash set -e +# --yes gets passed in by .travis.yml, +# which makes this easier to test locally args=${@:1} # always publish a canary release if this is a PR build From 53ec49609bc567e8d81ec35bf03db281a594df72 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 14:33:30 -0700 Subject: [PATCH 46/55] add compare-published script --- script/compare-published | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 script/compare-published diff --git a/script/compare-published b/script/compare-published new file mode 100755 index 0000000000..ada802330a --- /dev/null +++ b/script/compare-published @@ -0,0 +1,18 @@ +#!/bin/bash +set -e + +tag=${1:${NPM_TAG}:-latest} +modules=`ls -1 modules | egrep primer-` + +# separator +s=, + +echo "📦 Comparing Primer modules published @${tag}..." +( + echo "module${s}tag${s}published${s}local" + for module in $modules; do + v_published=`npm info ${module}@${tag} .version` + v_local=`jq -Mr .version modules/${module}/package.json` + echo "${module}${s}${tag}${s}${v_published:-x}${s}${v_local}" + done +) | column -t -s=${s} From c1ad97221f7e636a93f79ac4e401ed69063fee75 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 14:36:49 -0700 Subject: [PATCH 47/55] tidy up compare-published script --- script/compare-published | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/script/compare-published b/script/compare-published index ada802330a..c7508453b7 100755 --- a/script/compare-published +++ b/script/compare-published @@ -1,10 +1,14 @@ #!/bin/bash set -e -tag=${1:${NPM_TAG}:-latest} +# reads the tag either from $NPM_TAG or first positional arg: +# script/compare-published [tag] +tag=${1:-${NPM_TAG:-latest}} + +# this is way faster than `lerna exec npm info . .name` modules=`ls -1 modules | egrep primer-` -# separator +# tabular output separator for column(1) s=, echo "📦 Comparing Primer modules published @${tag}..." From 9991349f9a62b6573be616c67ec36756985062e3 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 15:04:38 -0700 Subject: [PATCH 48/55] add caveat in compare-published --- script/compare-published | 1 + 1 file changed, 1 insertion(+) diff --git a/script/compare-published b/script/compare-published index c7508453b7..2f637c674e 100755 --- a/script/compare-published +++ b/script/compare-published @@ -6,6 +6,7 @@ set -e tag=${1:-${NPM_TAG:-latest}} # this is way faster than `lerna exec npm info . .name` +# (but will skip modules that don't have "primer-" in them) modules=`ls -1 modules | egrep primer-` # tabular output separator for column(1) From d7ddfef3dcd8aa59fcbd231cade7a40e1d51fe0b Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 15:20:48 -0700 Subject: [PATCH 49/55] reorder lerna publish args --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bfa19e2b35..9fbd496de9 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "updated": "lerna updated", "release": "lerna publish", "release-candidate": "lerna publish --npm-tag=rc", - "release-canary": "lerna publish --canary --npm-tag=canary", + "release-canary": "lerna publish --npm-tag=canary --canary", "test": "lerna run test" }, "devDependencies": { From b57d5297a1b282bfdf191ef4619129c41dd3e73e Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 15:23:07 -0700 Subject: [PATCH 50/55] echo the rc and release commands, just to be safe --- script/cibuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/cibuild b/script/cibuild index 315be2b65c..7ac7c1b405 100755 --- a/script/cibuild +++ b/script/cibuild @@ -12,11 +12,11 @@ if [[ $TRAVIS_EVENT_TYPE = pull_request ]]; then # merges to dev build a release candidate elif [[ $TRAVIS_BRANCH = dev ]]; then echo "👌 Publishing release candidate..." - npm run release-candidate -- ${args} + echo npm run release-candidate -- ${args} # publish a release when we merge to master elif [[ $TRAVIS_BRANCH = master ]]; then echo "📦 Publishing latest release!" - npm run release -- ${args} + echo npm run release -- ${args} else echo "⚠️ This isn't a PR and '${TRAVIS_BRANCH}' isn't a release branch." exit 1 From 871d806ad650d599da691e235ae0fc89da1c03bc Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 11:25:26 -0700 Subject: [PATCH 51/55] disable primer/selector-no-utility --- modules/primer-utilities/lib/padding.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/primer-utilities/lib/padding.scss b/modules/primer-utilities/lib/padding.scss index 5c7d4f4faf..f62d7e40d3 100644 --- a/modules/primer-utilities/lib/padding.scss +++ b/modules/primer-utilities/lib/padding.scss @@ -67,6 +67,7 @@ } // responsive padding for containers +// stylelint-disable-next-line primer/selector-no-utility .p-responsive { padding-right: $spacer-3 !important; padding-left: $spacer-3 !important; From 7659b632623263120a093cedb371439a0dd6509d Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 16:03:37 -0700 Subject: [PATCH 52/55] confirm travis auth --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbb4eb117b..b44fcda161 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,12 @@ node_js: - 7 before_script: - - lerna bootstrap + - echo "//registry.npmjs.org/:_authToken=\${NPM_API_KEY}" > .npmrc + - npm whoami + - echo lerna bootstrap script: - - npm test + - echo npm test after_success: - - echo "//registry.npmjs.org/:_authToken=\${NPM_API_KEY}" > .npmrc - - script/cibuild --yes + - echo script/cibuild --yes From ae023e039a38efe07ffdbee122b40250260a1537 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 16:11:48 -0700 Subject: [PATCH 53/55] try npm config set --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b44fcda161..0cfba2a109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ node_js: - 7 before_script: - - echo "//registry.npmjs.org/:_authToken=\${NPM_API_KEY}" > .npmrc + - npm config set "//registry.npmjs.org/:_authToken=\${NPM_API_KEY}" - npm whoami - echo lerna bootstrap From a9559e89d08da6932a4b7ef2c592043823520b09 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Wed, 12 Jul 2017 16:21:30 -0700 Subject: [PATCH 54/55] run stuff again --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cfba2a109..354af9b9fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ node_js: before_script: - npm config set "//registry.npmjs.org/:_authToken=\${NPM_API_KEY}" - npm whoami - - echo lerna bootstrap + - lerna bootstrap script: - - echo npm test + - npm test after_success: - - echo script/cibuild --yes + - script/cibuild --yes From 0ce097eaaf3b7ebf18bd73e2a616ee586cf57744 Mon Sep 17 00:00:00 2001 From: Shawn Allen Date: Thu, 13 Jul 2017 12:21:02 -0700 Subject: [PATCH 55/55] nix `npm whoami` call --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 354af9b9fc..bb7845a32d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ node_js: before_script: - npm config set "//registry.npmjs.org/:_authToken=\${NPM_API_KEY}" - - npm whoami - lerna bootstrap script: