diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-11-13 15:22:07 +0300 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-11-13 15:22:07 +0300 |
| commit | f2ef5e2ee8ae46d324e4136dbc95ea40d1f21841 (patch) | |
| tree | 145f3429f5663dd7c4757fe8b34441ebf415295f | |
| parent | 9cebb1e49056f059053da7250429de34720c11de (diff) | |
| parent | b71f0562d8668bb59725f5057ed1665f4caf21d2 (diff) | |
Merge branch 'leipert-upgrade-node-yarn' into 'master'
Upgrade to node v10.x and yarn 1.12.x
See merge request gitlab-org/gitlab-ce!22979
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .nvmrc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54ce9f4956f..422da05ba5f 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/ @@ -1 +1 @@ -8.11.3 +10.13.0 |