Skip to content

Commit

Permalink
Fix ci passed when npm run-script failed. [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
kaikaifeng committed Oct 12, 2018
1 parent f53fe6c commit 313df68
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 20 deletions.
15 changes: 14 additions & 1 deletion .travis.yml
Expand Up @@ -107,7 +107,6 @@ jobs:

- &stage-contract-test-sha3-secp256k1
<<: *stage-integrate-test-sha3-secp256k1
name: Contract Test
language: node_js
node_js:
- lts/*
Expand All @@ -122,28 +121,40 @@ jobs:
- travis_retry yarn install
script: npm run-script unit_group
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Permission
script: npm run-script unit_permission
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Auth
script: npm run-script unit_auth
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Chain
script: npm run-script unit_chain
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Group Management
script: npm run-script unit_gm
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Permission Management
script: npm run-script unit_pm
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Role Management
script: npm run-script unit_rm
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Quota Management
script: npm run-script unit_qm
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Abi
script: npm run-script abi
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Admin
script: npm run-script unit_admin
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Store
script: npm run-script store
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Batch Tx
script: npm run-script batch_tx
- <<: *stage-contract-test-sha3-secp256k1
name: Unit Uint8
script: npm run-script uint8

- <<: *stage-contract-test-sha3-secp256k1
Expand All @@ -158,6 +169,7 @@ jobs:
- npm run-script unit_node

- <<: *stage-contract-test-sha3-secp256k1
name: Integrate Quota
install:
- cd $TRAVIS_BUILD_DIR/target/install
- ./env.sh ./scripts/create_cita_config.py create --nodes "127.0.0.1:4100" --contract_arguments "SysConfig.checkQuota=true"
Expand All @@ -167,6 +179,7 @@ jobs:
- npm run-script integrate_quota

- <<: *stage-contract-test-sha3-secp256k1
name: Integrate Permission
install:
- cd $TRAVIS_BUILD_DIR/target/install
- ./env.sh ./scripts/create_cita_config.py create --nodes "127.0.0.1:4100" --contract_arguments "SysConfig.checkPermission=true"
Expand Down
2 changes: 1 addition & 1 deletion cita-bft
34 changes: 17 additions & 17 deletions scripts/contracts/tests/package.json
Expand Up @@ -9,23 +9,23 @@
"eslint-plugin-import": "^2.12.0"
},
"scripts": {
"unit_group": "mocha test/unit/group.js -t 60s; eslint test/unit/group.js",
"unit_permission": "mocha test/unit/permission.js -t 60s; eslint test/unit/permission.js",
"unit_gm": "mocha test/unit/group_management.js -t 60s; eslint test/unit/group_management.js",
"unit_pm": "mocha test/unit/permission_management.js -t 60s; eslint test/unit/permission_management.js",
"unit_rm": "mocha test/unit/role_management.js -t 60s; eslint test/unit/role_management.js",
"unit_auth": "mocha test/unit/authorization.js -t 60s; eslint test/unit/authorization.js",
"unit_quota": "mocha test/unit/quota.js -t 60s; eslint test/unit/quota.js",
"unit_qm": "mocha test/unit/quota_manager.js -t 60s; eslint test/unit/quota_manager.js",
"unit_node": "mocha test/unit/node_manager.js -t 60s; eslint test/unit/node_manager.js",
"unit_chain": "mocha test/unit/chain_manager.js -t 60s; eslint test/unit/chain_manager.js",
"unit_admin": "mocha test/unit/admin.js -t 60s; eslint test/unit/admin.js",
"uint8": "mocha test/unit/uint8.js -t 60s; eslint test/unit/uint8.js",
"integrate_quota": "mocha test/integrate/quota -t 60s; eslint test/integrate/quota.js",
"abi": "mocha test/integrate/abi.js -t 60s; eslint test/integrate/abi.js",
"store": "mocha test/integrate/store.js -t 60s; eslint test/integrate/store.js",
"batch_tx": "mocha test/integrate/batch_tx.js -t 60s; eslint test/integrate/batch_tx.js",
"permission": "mocha test/integrate/permission.js -t 60s; eslint test/integrate/permission.js",
"unit_group": "eslint test/unit/group.js && mocha test/unit/group.js -t 60s",
"unit_permission": "eslint test/unit/permission.js && mocha test/unit/permission.js -t 60s",
"unit_gm": "eslint test/unit/group_management.js && mocha test/unit/group_management.js -t 60s",
"unit_pm": "eslint test/unit/permission_management.js && mocha test/unit/permission_management.js -t 60s",
"unit_rm": "eslint test/unit/role_management.js && mocha test/unit/role_management.js -t 60s",
"unit_auth": "eslint test/unit/authorization.j && mocha test/unit/authorization.js -t 60s",
"unit_quota": "eslint test/unit/quota.js && mocha test/unit/quota.js -t 60s",
"unit_qm": "eslint test/unit/quota_manager.js && mocha test/unit/quota_manager.js -t 60s",
"unit_node": "eslint test/unit/node_manager.js && mocha test/unit/node_manager.js -t 60s",
"unit_chain": "eslint test/unit/chain_manager.js && mocha test/unit/chain_manager.js -t 60s",
"unit_admin": "eslint test/unit/admin.js && mocha test/unit/admin.js -t 60s",
"uint8": "eslint test/unit/uint8.js && mocha test/unit/uint8.js -t 60s",
"integrate_quota": "eslint test/integrate/quota.js && mocha test/integrate/quota -t 60s",
"abi": "eslint test/integrate/abi.js && mocha test/integrate/abi.js -t 60s",
"store": "eslint test/integrate/store.js && mocha test/integrate/store.js -t 60s",
"batch_tx": "eslint test/integrate/batch_tx.js && mocha test/integrate/batch_tx.js -t 60s",
"permission": "eslint test/integrate/permission.js && mocha test/integrate/permission.js -t 60s",
"lint": "eslint test",
"lint-fix": "eslint --fix test"
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/txtool/txtool/proto
Submodule proto updated from eaf7d5 to 669ae4

0 comments on commit 313df68

Please sign in to comment.