From b88b9861a3b3ca534dbacaa14f0ec935d42081a5 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 23 Nov 2015 10:45:55 -0500 Subject: [PATCH 01/13] Add OS X build environment Signed-off-by: Jeffrey Morgan --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2aceb2c4ab..cb27f954b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,3 +8,7 @@ cache: directories: - resources - node_modules + +os: + - linux + - osx From 7348ce48e2f1ad51711f6537617e56b6b6aa8dd1 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 23 Nov 2015 10:49:30 -0500 Subject: [PATCH 02/13] Remove linux env in travis ci Signed-off-by: Jeffrey Morgan --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb27f954b5..b457065361 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,4 @@ cache: - node_modules os: - - linux - osx From c87f44b6df7a63d57937d3720582008832097d2b Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 23 Nov 2015 10:52:06 -0500 Subject: [PATCH 03/13] Brew install nodejs Signed-off-by: Jeffrey Morgan --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b457065361..d6a671dca1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,11 @@ -language: node_js -node_js: - - '4.1.2' - -sudo: false - cache: directories: - resources - node_modules +before_install: + - brew update + - brew install homebrew/versions/node4-lts + os: - osx From 99ee78906d74c3e0ea748891337d3c4e06ae7411 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 23 Nov 2015 10:56:08 -0500 Subject: [PATCH 04/13] Dont update Signed-off-by: Jeffrey Morgan --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d6a671dca1..815d70a1f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ cache: - node_modules before_install: + - node -v + - brew unlink node - brew update - brew install homebrew/versions/node4-lts From d68f80ee6af245d6a4f4c610a2a79222ecdebc1e Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 23 Nov 2015 11:03:50 -0500 Subject: [PATCH 05/13] Add tests to .travis.yml Signed-off-by: Jeffrey Morgan --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 815d70a1f8..eedd180653 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,15 @@ +script: + - npm install + - npm test + cache: directories: - resources - node_modules before_install: - - node -v - - brew unlink node - brew update + - brew unlink node - brew install homebrew/versions/node4-lts os: From eeaf2d1f7ad85be0b4b5d562f9a5d49bfadf498a Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 23 Nov 2015 13:33:55 -0500 Subject: [PATCH 06/13] Run after script Signed-off-by: Jeffrey Morgan --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index eedd180653..89d335bb34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,3 @@ -script: - - npm install - - npm test - cache: directories: - resources @@ -12,5 +8,12 @@ before_install: - brew unlink node - brew install homebrew/versions/node4-lts +script: + - npm install + - npm test + +after_script: + - bash -c "$AFTER_SCRIPT" + os: - osx From 4db8fe5c48789c28850ea6b5f13f7bcd99e0fd33 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 23 Nov 2015 13:48:45 -0500 Subject: [PATCH 07/13] Remove after script for now Signed-off-by: Jeffrey Morgan --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89d335bb34..f357a73ad8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,5 @@ script: - npm install - npm test -after_script: - - bash -c "$AFTER_SCRIPT" - os: - osx From 42a583b2eb8356acd9574e5ecfc546ff5050f6f9 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 24 Nov 2015 10:19:24 -0500 Subject: [PATCH 08/13] Speed up travis build Signed-off-by: Jeffrey Morgan --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f357a73ad8..050f81f3f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,6 @@ cache: - node_modules before_install: - - brew update - - brew unlink node - brew install homebrew/versions/node4-lts script: From 29ad1d3de277af3c942846f01b50185361bea016 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 24 Nov 2015 10:28:46 -0500 Subject: [PATCH 09/13] Brew tap repair Signed-off-by: Jeffrey Morgan --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 050f81f3f8..970516d3cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ cache: - node_modules before_install: + - brew unlink node + - brew update - brew install homebrew/versions/node4-lts script: From 1b58372fa7a8e225b763207319033761adc56a97 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 24 Nov 2015 10:38:57 -0500 Subject: [PATCH 10/13] Run integration tests on travis Signed-off-by: Jeffrey Morgan --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 970516d3cf..3c967fd923 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_install: script: - npm install - npm test + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && npm run integration || false' os: - osx From 1c183201445e2aef71c16421e558f31bb841a0b6 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 24 Nov 2015 12:31:40 -0500 Subject: [PATCH 11/13] Sign Signed-off-by: Jeffrey Morgan --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3c967fd923..0f6a3bd4fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,5 +13,10 @@ script: - npm test - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && npm run integration || false' +after_script: + - echo $KEY_CONTENT > ~/Library/Keychains/keychain.keychain + - security unlock-keychain -p "$KEY_SECRET" keychain.keychain + - npm run release + os: - osx From 55f0bbe16484a217095a77e3b021c1ee0a58b8c4 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 24 Nov 2015 12:51:15 -0500 Subject: [PATCH 12/13] Add proper release command to Travis Signed-off-by: Jeffrey Morgan --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0f6a3bd4fe..b6e84123b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,9 @@ script: after_script: - echo $KEY_CONTENT > ~/Library/Keychains/keychain.keychain + - ls -al ~/Library/Keychains/ - security unlock-keychain -p "$KEY_SECRET" keychain.keychain - - npm run release + - grunt release os: - osx From c365db437b185ab3e97c35fd86e184c82aeeee67 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 24 Nov 2015 13:11:31 -0500 Subject: [PATCH 13/13] Fix after_script Signed-off-by: Jeffrey Morgan --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6e84123b6..3ad7f44200 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,8 @@ script: - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && npm run integration || false' after_script: - - echo $KEY_CONTENT > ~/Library/Keychains/keychain.keychain - - ls -al ~/Library/Keychains/ - - security unlock-keychain -p "$KEY_SECRET" keychain.keychain + - echo $MAC_KEY_CONTENT > mac_key_content.hex && xxd -p -r mac_key_content.hex ~/Library/Keychains/keychain.keychain && rm mac_key_content.hex + - security unlock-keychain -p "$KEY_SECRET" ~/Library/Keychains/keychain.keychain - grunt release os: