Commit 6adb769e authored by Mike Greiling's avatar Mike Greiling

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
parents fb00525a 60a1f54f
...@@ -637,7 +637,7 @@ gitlab:setup-mysql: ...@@ -637,7 +637,7 @@ gitlab:setup-mysql:
# Frontend-related jobs # Frontend-related jobs
gitlab:assets:compile: gitlab:assets:compile:
<<: *dedicated-no-docs-and-no-qa-pull-cache-job <<: *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: [] dependencies: []
services: services:
- docker:stable-dind - docker:stable-dind
......
...@@ -159,5 +159,8 @@ ...@@ -159,5 +159,8 @@
"prettier": "1.15.2", "prettier": "1.15.2",
"vue-jest": "^3.0.1", "vue-jest": "^3.0.1",
"webpack-dev-server": "^3.1.10" "webpack-dev-server": "^3.1.10"
},
"engines": {
"yarn": "^1.10.0"
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment