From 87910a326b42789309707991a2d15c89f66ccca4 Mon Sep 17 00:00:00 2001 From: Jose Ivan Vargas Date: Thu, 2 Nov 2017 12:18:20 -0600 Subject: [PATCH] Add chrome-node-yarn image --- .gitlab-ci.yml | 2 ++ scripts/install-node | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbade6e..0316e7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,7 @@ ruby-2.3.5-golang-1.8-git-2.13-phantomjs-2.1-node-8.x-yarn-1.0-postgresql-9.6 te ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_custom golang-1.8-git-2.8.4 test: *test_custom golang-1.8-git-2.13 test: *test_custom +node-8.9-chrome-62.0-yarn-1.2 test: *test_custom www-gitlab-com test: *test_build gitlab-qa test: *test_build @@ -89,6 +90,7 @@ ruby-2.3.5-golang-1.8-git-2.13-phantomjs-2.1-node-8.x-yarn-1.0-postgresql-9.6: * ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy_custom golang-1.8-git-2.8.4: *build_and_deploy_custom golang-1.8-git-2.13: *build_and_deploy_custom +node-8.9-chrome-62.0-yarn-1.2: *build_and_deploy_custom www-gitlab-com: *build_and_deploy gitlab-qa: *build_and_deploy diff --git a/scripts/install-node b/scripts/install-node index 449eaa2..c50fc47 100755 --- a/scripts/install-node +++ b/scripts/install-node @@ -5,6 +5,8 @@ set -xeo pipefail NODE_VERSION=${1:-7.x} YARN_VERSION=${2:-0.27.5-1} +if [ "$NODE_VERSION" = 8.9.0 ]; then NODE_VERSION=8.x; fi + # add official debian repos for node and yarn curl -sS -L https://deb.nodesource.com/setup_${NODE_VERSION} | bash - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -