Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
vgrichina committed Aug 27, 2019
2 parents 2fd0625 + 1d4e082 commit 848181f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test:
tags:
- gcloud
script:
- git clone --depth 1 https://github.com/nearprotocol/nearcore.git nearcore
- git clone --depth 1 -b known-stable https://github.com/nearprotocol/nearcore.git nearcore
- yarn
- yarn build
- (cd nearcore && ./scripts/build_wasm.sh)
Expand Down
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@
"browserify": "^16.2.3",
"documentation": "^9.1.1",
"eslint": "^5.14.0",
"in-publish": "^2.0.0",
"jest": "^24.1.0",
"localstorage-memory": "^1.0.3",
"rimraf": "^2.6.3",
"ts-protoc-gen": "^0.10.0",
"tslint": "^5.18.0",
"typedoc": "^0.14.2",
"typedoc-plugin-markdown": "^1.2.1",
"uglifyify": "^5.0.1"
Expand All @@ -41,7 +44,9 @@
"keywords": [],
"license": "MIT",
"scripts": {
"dist": "yarn build && yarn doc && browserify browser-exports.js -i node-fetch -o dist/nearlib.js && browserify browser-exports.js -i node-fetch -g uglifyify -o dist/nearlib.min.js",
"dist": "yarn browserify && yarn doc",
"browserify": "browserify browser-exports.js -i node-fetch -o dist/nearlib.js && browserify browser-exports.js -i node-fetch -g uglifyify -o dist/nearlib.min.js",
"prepublish": "not-in-install && (yarn build && yarn browserify) || in-install",
"compile": "tsc -p ./tsconfig.json",
"dev": "yarn compile -w",
"build": "yarn compile",
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 848181f

Please sign in to comment.