mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
tech(build): replace npm with yarn (#7108)
* tech(build): replace npm with yarn * tech(build): change node version for CI
This commit is contained in:
committed by
Torkel Ödegaard
parent
7433e8c58f
commit
e61d049623
2
Makefile
2
Makefile
@@ -4,7 +4,7 @@ deps-go:
|
|||||||
go run build.go setup
|
go run build.go setup
|
||||||
|
|
||||||
deps-js:
|
deps-js:
|
||||||
npm install
|
yarn install
|
||||||
|
|
||||||
deps: deps-go deps-js
|
deps: deps-go deps-js
|
||||||
|
|
||||||
|
|||||||
@@ -114,7 +114,8 @@ To build less to css for the frontend you will need a recent version of **node (
|
|||||||
npm (v2.5.0) and grunt (v0.4.5). Run the following:
|
npm (v2.5.0) and grunt (v0.4.5). Run the following:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm install
|
npm install -g yarn
|
||||||
|
yarn install
|
||||||
npm run build
|
npm run build
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ environment:
|
|||||||
install:
|
install:
|
||||||
# install nodejs and npm
|
# install nodejs and npm
|
||||||
- ps: Install-Product node $env:nodejs_version
|
- ps: Install-Product node $env:nodejs_version
|
||||||
- npm install
|
- npm install -g yarn
|
||||||
|
- yarn install
|
||||||
- npm install -g grunt-cli
|
- npm install -g grunt-cli
|
||||||
# install gcc (needed for sqlite3)
|
# install gcc (needed for sqlite3)
|
||||||
- choco install -y --limit-output mingw
|
- choco install -y --limit-output mingw
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
machine:
|
machine:
|
||||||
node:
|
node:
|
||||||
version: 5.11.1
|
version: 6.9.2
|
||||||
environment:
|
environment:
|
||||||
GOPATH: "/home/ubuntu/.go_workspace"
|
GOPATH: "/home/ubuntu/.go_workspace"
|
||||||
ORG_PATH: "github.com/grafana"
|
ORG_PATH: "github.com/grafana"
|
||||||
|
|||||||
@@ -40,7 +40,8 @@ To build less to css for the frontend you will need a recent version of node (v0
|
|||||||
npm (v2.5.0) and grunt (v0.4.5). Run the following:
|
npm (v2.5.0) and grunt (v0.4.5). Run the following:
|
||||||
|
|
||||||
```
|
```
|
||||||
npm install
|
npm install -g yarn
|
||||||
|
yarn install
|
||||||
npm install -g grunt-cli
|
npm install -g grunt-cli
|
||||||
grunt
|
grunt
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ function exit_if_fail {
|
|||||||
cd /home/ubuntu/.go_workspace/src/github.com/grafana/grafana
|
cd /home/ubuntu/.go_workspace/src/github.com/grafana/grafana
|
||||||
|
|
||||||
rm -rf node_modules
|
rm -rf node_modules
|
||||||
npm install -g npm
|
npm install -g yarn
|
||||||
npm install
|
yarn install
|
||||||
|
|
||||||
exit_if_fail npm test
|
exit_if_fail npm test
|
||||||
exit_if_fail npm run coveralls
|
exit_if_fail npm run coveralls
|
||||||
|
|||||||
Reference in New Issue
Block a user