diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54ce9f4956fb30a24aca1bb8875706d548e12d7f..422da05ba5fd09a01c1863be7f57b30b8dba0f63 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/ @@ -589,7 +589,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 dba04c1e1786b2c5f953ebf2c24c6fcc615c2d9a..db24ab967fb52af99df9337d762d6ffe5efa6313 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -8.11.3 +10.13.0