From b71f0562d8668bb59725f5057ed1665f4caf21d2 Mon Sep 17 00:00:00 2001 From: Lukas Eipert Date: Mon, 12 Nov 2018 09:49:52 +0100 Subject: [PATCH] Upgrade to node v10.x --- .gitlab-ci.yml | 6 +++--- .nvmrc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 407cd8696a2..d22a6de035d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29" .dedicated-runner: &dedicated-runner retry: 1 @@ -6,7 +6,7 @@ image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.4.5-golang-1.9-git - gitlab-org .default-cache: &default-cache - key: "ruby-2.4.5-debian-stretch-with-yarn" + key: "debian-stretch-ruby-2.4.5-node-10.x" paths: - vendor/ruby - .yarn-cache/ @@ -588,7 +588,7 @@ static-analysis: script: - scripts/static-analysis cache: - key: "ruby-2.4.5-debian-stretch-with-yarn-and-rubocop" + key: "debian-stretch-ruby-2.4.5-node-10.x-and-rubocop" paths: - vendor/ruby - .yarn-cache/ diff --git a/.nvmrc b/.nvmrc index dba04c1e178..db24ab967fb 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -8.11.3 +10.13.0