Skip to content

Commit

Permalink
Use hello-wasm package, fix CI to use staging nearcore for real
Browse files Browse the repository at this point in the history
  • Loading branch information
vgrichina committed Oct 1, 2019
1 parent 60169ca commit 57ba3df
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 10 deletions.
9 changes: 1 addition & 8 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ image: node:10

variables:
NODE_ENV: ci
HELLO_WASM_PATH: nearcore/tests/hello.wasm

stages:
- test
Expand All @@ -12,22 +11,16 @@ test_master:
tags:
- gcloud
script:
- git clone --depth 1 https://github.com/nearprotocol/nearcore.git nearcore
- yarn
- yarn build
- (cd nearcore && ./scripts/build_wasm.sh)
- yarn test

test_staging:
stage: test
tags:
- gcloud
script:
- git clone --depth 1 --branch staging https://github.com/nearprotocol/nearcore.git nearcore
- yarn
- yarn build
- (cd nearcore && ./scripts/build_wasm.sh)
- yarn test
- NODE_ENV=ci-staging yarn test

lint:
stage: test
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"in-publish": "^2.0.0",
"jest": "^24.1.0",
"localstorage-memory": "^1.0.3",
"near-hello": "^0.2.0",
"rimraf": "^2.6.3",
"ts-protoc-gen": "^0.10.0",
"tslint": "^5.18.0",
Expand Down
2 changes: 1 addition & 1 deletion test/account.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const BN = require('bn.js');
let nearjs;
let workingAccount;

const HELLO_WASM_PATH = process.env.HELLO_WASM_PATH || '../nearcore/tests/hello.wasm';
const HELLO_WASM_PATH = process.env.HELLO_WASM_PATH || 'node_modules/near-hello/dist/hello.wasm';

jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;

Expand Down
2 changes: 1 addition & 1 deletion test/test-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const networkId = 'unittest';
const testAccountName = 'test.near';

const INITIAL_BALANCE = new BN(100000000000);
const HELLO_WASM_PATH = process.env.HELLO_WASM_PATH || '../nearcore/tests/hello.wasm';
const HELLO_WASM_PATH = process.env.HELLO_WASM_PATH || 'node_modules/near-hello/dist/hello.wasm';

async function setUpTestConnection() {
const keyStore = new nearlib.keyStores.InMemoryKeyStore();
Expand Down
25 changes: 25 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 57ba3df

Please sign in to comment.