From a730bec6f48ffd85168d458c95a20e2844e62746 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 26 Aug 2020 11:54:50 -0400 Subject: [PATCH] Ship with node 12 (#1998) See #1894 See #1892 See #1810 --- ci/images/centos7/Dockerfile | 7 ++++--- ci/images/debian8/Dockerfile | 2 +- ci/steps/release-packages.sh | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ci/images/centos7/Dockerfile b/ci/images/centos7/Dockerfile index 4e3f1f94..92c21202 100644 --- a/ci/images/centos7/Dockerfile +++ b/ci/images/centos7/Dockerfile @@ -1,9 +1,10 @@ FROM centos:7 +ARG NODE_VERSION=v12.18.3 RUN ARCH="$(uname -m | sed 's/86_64/64/; s/aarch64/arm64/')" && \ - curl -fsSL "https://nodejs.org/dist/v14.4.0/node-v14.4.0-linux-$ARCH.tar.xz" | tar -C /usr/local -xJ && \ - mv /usr/local/node-v14.4.0-linux-$ARCH /usr/local/node-v14.4.0 -ENV PATH=/usr/local/node-v14.4.0/bin:$PATH + curl -fsSL "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-$ARCH.tar.xz" | tar -C /usr/local -xJ && \ + mv "/usr/local/node-$NODE_VERSION-linux-$ARCH" "/usr/local/node-$NODE_VERSION" +ENV PATH=/usr/local/node-$NODE_VERSION/bin:$PATH RUN npm install -g yarn RUN yum groupinstall -y 'Development Tools' diff --git a/ci/images/debian8/Dockerfile b/ci/images/debian8/Dockerfile index fa3b16dc..4c62a398 100644 --- a/ci/images/debian8/Dockerfile +++ b/ci/images/debian8/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update RUN apt-get install -y curl gnupg # Installs node. -RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - && \ +RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - && \ apt-get install -y nodejs # Installs yarn. diff --git a/ci/steps/release-packages.sh b/ci/steps/release-packages.sh index 040c9de0..95cfac65 100755 --- a/ci/steps/release-packages.sh +++ b/ci/steps/release-packages.sh @@ -5,8 +5,9 @@ main() { cd "$(dirname "$0")/../.." if [[ $OSTYPE == darwin* ]]; then - curl -L https://nodejs.org/dist/v14.4.0/node-v14.4.0-darwin-x64.tar.gz | tar -xz - PATH="$PWD/node-v14.4.0-darwin-x64/bin:$PATH" + NODE_VERSION=v12.18.3 + curl -L "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-darwin-x64.tar.gz" | tar -xz + PATH="$PWD/node-$NODE_VERSION-darwin-x64/bin:$PATH" fi # https://github.com/actions/upload-artifact/issues/38