From 99881a2a6d2db3a14fe53534eb8560eca3ed870f Mon Sep 17 00:00:00 2001 From: Lukas Eipert Date: Thu, 13 Jun 2019 19:47:19 +0200 Subject: [PATCH] Add build images for node@12 --- .gitlab-ci.yml | 8 ++++++++ scripts/custom-docker-build | 2 ++ scripts/install-www-gitlab-com | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63644a6..cb99950 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,9 +65,13 @@ ruby-2.6-golang-1.12-git-2.21 test: *test_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29 test: *test_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-11-graphicsmagick-1.3.29 test: *test_custom +ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom +ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.29 test: *test_custom +ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-11-graphicsmagick-1.3.29 test: *test_custom # gitlab:assets:compile step ruby-2.6.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom +ruby-2.6.3-git-2.21-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1 test: *test_custom @@ -113,9 +117,13 @@ ruby-2.6-golang-1.12-git-2.21: *build_and_deploy_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29: *build_and_deploy_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-11-graphicsmagick-1.3.29: *build_and_deploy_custom +ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom +ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.29: *build_and_deploy_custom +ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-11-graphicsmagick-1.3.29: *build_and_deploy_custom # gitlab:assets:compile step ruby-2.6.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom +ruby-2.6.3-git-2.21-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 7e97d90..3ccfb34 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -77,6 +77,7 @@ function print_node_args() { case "$1" in 8.x) NODE_INSTALL_VERSION=8.x ;; 10.x) NODE_INSTALL_VERSION=10.x ;; + 12.x) NODE_INSTALL_VERSION=12.x ;; *) echo "Unknown node version $1"; exit 1; esac printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION" @@ -85,6 +86,7 @@ function print_node_args() { function print_yarn_args() { case "$1" in 1.12) YARN_INSTALL_VERSION=1.12.3-1 ;; + 1.16) YARN_INSTALL_VERSION=1.16.0-1 ;; *) echo "Unknown yarn version $1"; exit 1; esac printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION" diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com index cca68fd..3766572 100755 --- a/scripts/install-www-gitlab-com +++ b/scripts/install-www-gitlab-com @@ -22,8 +22,8 @@ rm -rf /tmp/pandoc* apt-get install -yq --no-install-recommends imagemagick # Installing node & yarn -NODE_INSTALL_VERSION=8.x -YARN_INSTALL_VERSION=1.2.1-1 +NODE_INSTALL_VERSION=12.x +YARN_INSTALL_VERSION=1.16.0-1 /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version # Installing gitlab-runner