Make various scripts use the same version of Node

pull/11627/head
murgatroid99 8 years ago
parent 71a78e92cb
commit 7ad758cd84
  1. 5
      templates/tools/dockerfile/node_deps.include
  2. 5
      tools/dockerfile/interoptest/grpc_interop_node/Dockerfile
  3. 5
      tools/dockerfile/test/multilang_jessie_x64/Dockerfile
  4. 5
      tools/dockerfile/test/node_jessie_x64/Dockerfile
  5. 2
      tools/run_tests/artifacts/build_artifact_node.sh
  6. 2
      tools/run_tests/artifacts/build_package_node.sh
  7. 2
      tools/run_tests/helper_scripts/build_node_electron.sh
  8. 2
      tools/run_tests/helper_scripts/pre_build_node_electron.sh
  9. 2
      tools/run_tests/helper_scripts/run_node_electron.sh
  10. 2
      tools/run_tests/performance/run_worker_node.sh

@ -5,7 +5,8 @@
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash
# Install all versions of node that we want to test
RUN /bin/bash -l -c "nvm install 0.12 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 4 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 5 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm alias default 4"
RUN /bin/bash -l -c "nvm install 6 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 8 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm alias default 8"

@ -70,10 +70,11 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 six==1.10.0
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash
# Install all versions of node that we want to test
RUN /bin/bash -l -c "nvm install 0.12 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 4 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 5 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm alias default 4"
RUN /bin/bash -l -c "nvm install 6 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 8 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm alias default 8"
# Prepare ccache
RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
RUN ln -s /usr/bin/ccache /usr/local/bin/g++

@ -81,10 +81,11 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash
# Install all versions of node that we want to test
RUN /bin/bash -l -c "nvm install 0.12 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 4 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 5 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm alias default 4"
RUN /bin/bash -l -c "nvm install 6 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 8 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm alias default 8"
#=================
# PHP dependencies

@ -85,10 +85,11 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 six==1.10.0
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash
# Install all versions of node that we want to test
RUN /bin/bash -l -c "nvm install 0.12 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 4 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 5 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm alias default 4"
RUN /bin/bash -l -c "nvm install 6 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm install 8 && npm config set cache /tmp/npm-cache"
RUN /bin/bash -l -c "nvm alias default 8"
# Prepare ccache
RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
RUN ln -s /usr/bin/ccache /usr/local/bin/g++

@ -16,7 +16,7 @@
NODE_TARGET_ARCH=$1
source ~/.nvm/nvm.sh
nvm use 4
nvm use 8
set -ex
cd $(dirname $0)/../../..

@ -15,7 +15,7 @@
source ~/.nvm/nvm.sh
nvm use 4
nvm use 8
set -ex
cd $(dirname $0)/../../..

@ -17,7 +17,7 @@
ELECTRON_VERSION=$1
source ~/.nvm/nvm.sh
nvm use 6
nvm use 8
set -ex
# change to grpc repo root

@ -16,7 +16,7 @@
ELECTRON_VERSION=$1
nvm install 6
nvm install 8
set -ex
npm install xvfb-maybe

@ -15,7 +15,7 @@
source ~/.nvm/nvm.sh
nvm use 6
nvm use 8
set -ex
# change to grpc repo root

@ -14,7 +14,7 @@
# limitations under the License.
source ~/.nvm/nvm.sh
nvm use 7
nvm use 8
set -ex

Loading…
Cancel
Save