kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'leipert-node-12' into 'master'

Browse source 
Update to node@12

See merge request gitlab-org/gitlab-ce!29659
This commit is contained in:
Mike Greiling 2019-06-14 16:37:46 +00:00
commit 6622d77521
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab/ci/frontend.gitlab-ci.yml
View file

@ -16,7 +16,7 @@
gitlab:assets:compile: gitlab:assets:compile:
<<: *assets-compile-cache <<: *assets-compile-cache
extends: .dedicated-no-docs-pull-cache-job extends: .dedicated-no-docs-pull-cache-job
image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-git-2.21-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.29-docker-18.06.1
dependencies: dependencies:
- setup-test-env - setup-test-env
services: services:

2
.gitlab/ci/global.gitlab-ci.yml
View file

@ -9,7 +9,7 @@
- gitlab-org - gitlab-org
.default-cache: &default-cache .default-cache: &default-cache
key: "debian-stretch-ruby-2.6.3-node-10.x" key: "debian-stretch-ruby-2.6.3-node-12.x"
paths: paths:
- vendor/ruby - vendor/ruby
- .yarn-cache/ - .yarn-cache/

4
.gitlab/ci/rails.gitlab-ci.yml
View file

@ -92,7 +92,7 @@
.rspec-metadata-pg-10: &rspec-metadata-pg-10 .rspec-metadata-pg-10: &rspec-metadata-pg-10
<<: *rspec-metadata <<: *rspec-metadata
<<: *use-pg-10 <<: *use-pg-10
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-10-graphicsmagick-1.3.29" image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.29"
.rspec-metadata-mysql: &rspec-metadata-mysql .rspec-metadata-mysql: &rspec-metadata-mysql
<<: *rspec-metadata <<: *rspec-metadata
@ -240,7 +240,7 @@ static-analysis:
script: script:
- scripts/static-analysis - scripts/static-analysis
cache: cache:
key: "debian-stretch-ruby-2.6.3-node-10.x-and-rubocop" key: "debian-stretch-ruby-2.6.3-node-12.x-and-rubocop"
paths: paths:
- vendor/ruby - vendor/ruby
- .yarn-cache/ - .yarn-cache/

2
.nvmrc
View file

@ -1 +1 @@
10.13.0 12.4.0

6
doc/install/installation.md
View file

@ -263,7 +263,7 @@ Since GitLab 8.17, GitLab requires the use of Node to compile JavaScript
assets, and Yarn to manage JavaScript dependencies. The current minimum assets, and Yarn to manage JavaScript dependencies. The current minimum
requirements for these are: requirements for these are:
- `node` >= v8.10.0. - `node` >= v8.10.0. (We recommend node 12.x as it is faster)
- `yarn` >= v1.10.0. - `yarn` >= v1.10.0.
In many distros, In many distros,
@ -271,8 +271,8 @@ the versions provided by the official package repositories are out of date, so
we'll need to install through the following commands: we'll need to install through the following commands:
```sh ```sh
# install node v8.x # install node v12.x
curl --location https://deb.nodesource.com/setup_8.x | sudo bash - curl --location https://deb.nodesource.com/setup_12.x | sudo bash -
sudo apt-get install -y nodejs sudo apt-get install -y nodejs
curl --silent --show-error https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - curl --silent --show-error https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -