From 7be5f15e500af3dac7833b9a70b69fe8748c31dc Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Mon, 15 Jun 2015 18:19:44 -0400 Subject: [PATCH] fix clang CXX matching [publish binary] explicitly set CXX on OS X --- .travis.yml | 3 +++ scripts/travis_publish.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d2a5b8530..891496e03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,16 +68,19 @@ matrix: - os: osx compiler: clang env: + - CXX: clang++ - NODE_EXE: "iojs" - NODE_VERSION: 2.0.1 - os: osx compiler: clang env: + - CXX: clang++ - NODE_EXE: "node" - NODE_VERSION: 0.12.0 - os: osx compiler: clang env: + - CXX: clang++ - NODE_EXE: "node" - NODE_VERSION: 0.10.36 diff --git a/scripts/travis_publish.sh b/scripts/travis_publish.sh index da24832b4..d06a2a8a3 100755 --- a/scripts/travis_publish.sh +++ b/scripts/travis_publish.sh @@ -11,7 +11,7 @@ fi COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n') -if test "${COMMIT_MESSAGE#*'[publish binary]'}" != "$COMMIT_MESSAGE" && [[ $CXX == ^"clang++"* ]]; then +if test "${COMMIT_MESSAGE#*'[publish binary]'}" != "$COMMIT_MESSAGE" && [[ $CXX =~ ^clang* ]]; then npm install aws-sdk ./node_modules/.bin/node-pre-gyp package