Merge branch 'winh-check-yarn-version' into 'master'
Check that yarn version is at least 1.10.0 See merge request gitlab-org/gitlab-ce!23612
This commit is contained in:
commit
6adb769e88
2 changed files with 4 additions and 1 deletions
|
@ -637,7 +637,7 @@ gitlab:setup-mysql:
|
|||
# Frontend-related jobs
|
||||
gitlab:assets:compile:
|
||||
<<: *dedicated-no-docs-and-no-qa-pull-cache-job
|
||||
image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1
|
||||
image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1
|
||||
dependencies: []
|
||||
services:
|
||||
- docker:stable-dind
|
||||
|
|
|
@ -159,5 +159,8 @@
|
|||
"prettier": "1.15.2",
|
||||
"vue-jest": "^3.0.1",
|
||||
"webpack-dev-server": "^3.1.10"
|
||||
},
|
||||
"engines": {
|
||||
"yarn": "^1.10.0"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue