diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-02-09 08:49:52 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-02-09 08:59:35 -0800 |
| commit | a24026f554dabbbd8a30517b497f7d7bc98aa8b8 (patch) | |
| tree | 8eb611320bb1b0355bb8dbffbf3f47c1fcb71d8c | |
| parent | 2a9d5e1c01c556e9cec9b97ab358f2df49075d9b (diff) | |
fix node artifact building on mac
| -rwxr-xr-x | test/distrib/node/run_distrib_test.sh | 7 | ||||
| -rwxr-xr-x | tools/jenkins/docker_run.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/build_artifact_node.sh | 6 | ||||
| -rwxr-xr-x | tools/run_tests/build_package_node.sh | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/test/distrib/node/run_distrib_test.sh b/test/distrib/node/run_distrib_test.sh index ac9e7d7090..99a51f01f7 100755 --- a/test/distrib/node/run_distrib_test.sh +++ b/test/distrib/node/run_distrib_test.sh @@ -28,15 +28,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +NODE_VERSION=$1 +source ~/.nvm/nvm.sh set -ex cd $(dirname $0) -NODE_VERSION="$1" - -# make sure nvm is available -source ~/.nvm/nvm.sh || true - nvm install $NODE_VERSION npm install -g node-static diff --git a/tools/jenkins/docker_run.sh b/tools/jenkins/docker_run.sh index 519dc5cade..df7b6571d7 100755 --- a/tools/jenkins/docker_run.sh +++ b/tools/jenkins/docker_run.sh @@ -47,8 +47,6 @@ then rvm use ruby-2.1 fi -nvm use 4 || true - cd /var/local/git/grpc $RUN_COMMAND diff --git a/tools/run_tests/build_artifact_node.sh b/tools/run_tests/build_artifact_node.sh index ec3fb6462f..8aeec79d08 100755 --- a/tools/run_tests/build_artifact_node.sh +++ b/tools/run_tests/build_artifact_node.sh @@ -28,8 +28,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +NODE_TARGET_ARCH=$1 +source ~/.nvm/nvm.sh set -ex +nvm use 4 + cd $(dirname $0)/../.. rm -rf build @@ -42,6 +46,6 @@ node_versions=( 0.10.41 0.12.0 1.0.0 1.1.0 2.0.0 3.0.0 4.0.0 5.0.0 ) for version in ${node_versions[@]} do - node-pre-gyp configure rebuild package testpackage --target=$version --target_arch=$1 + node-pre-gyp configure rebuild package testpackage --target=$version --target_arch=$NODE_TARGET_ARCH cp -r build/stage/* artifacts/ done diff --git a/tools/run_tests/build_package_node.sh b/tools/run_tests/build_package_node.sh index 1358740264..a8b9448973 100755 --- a/tools/run_tests/build_package_node.sh +++ b/tools/run_tests/build_package_node.sh @@ -28,8 +28,11 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +source ~/.nvm/nvm.sh set -ex +nvm use 4 + cd $(dirname $0)/../.. mkdir -p artifacts/ |