diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..ae99284 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,14 @@ +kind: pipeline +type: docker +name: default + +steps: +- name: test + image: gitea.kosmos.org/kredits/docker-ci:latest + commands: + - cp -r /app/node_modules /drone/src/node_modules + - chown -R drone:drone /drone/src + - su drone -c 'npm install' + - su drone -c 'npm run devchain' & + - sleep 5 + - su drone -c 'npm test' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0496fc9..0000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -language: node_js -node_js: - - "12" - -sudo: false -dist: xenial - -cache: - directories: - - node_modules - - apps/contribution/node_modules - - apps/contributor/node_modules - - apps/proposal/node_modules - - apps/token/node_modules - - apps/vault/node_modules - -install: - - npm install -g @aragon/cli - - npm install -g truffle - - npm install - -before_script: - - npm run devchain & - - sleep 10 - -script: - - npm run lint:wrapper - - npm run lint:contract-tests - # FIXME Fix tests - # - npm run test:token - # - npm run test:contributor - # - npm run test:contribution - # - npm run test:proposal - -branches: - only: - - master diff --git a/package-lock.json b/package-lock.json index 93b6549..c07d67b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4793,12 +4793,12 @@ "tape": "^4.6.3" } }, + "node_modules/eth-block-tracker/async-eventemitter@github:ahultgren/async-eventemitter": { + "dev": true + }, "node_modules/eth-block-tracker/node_modules/async-eventemitter": { - "resolved": "git+ssh://git@github.com/ahultgren/async-eventemitter.git#fa06e39e56786ba541c180061dbf2c0a5bbf951c", - "dev": true, - "dependencies": { - "async": "^2.4.0" - } + "resolved": "node_modules/eth-block-tracker/async-eventemitter@github:ahultgren/async-eventemitter", + "link": true }, "node_modules/eth-block-tracker/node_modules/bn.js": { "version": "4.12.0", @@ -17371,13 +17371,6 @@ "web3-provider-engine": "^13.8.0" } }, - "node_modules/truffle-hdwallet-provider-privkey/node_modules/bignumber.js": { - "resolved": "git+ssh://git@github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/truffle-hdwallet-provider-privkey/node_modules/utf8": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", @@ -17397,6 +17390,13 @@ "xmlhttprequest": "*" } }, + "node_modules/truffle-hdwallet-provider-privkey/node_modules/web3/bignumber.js@git+https:/github.com/frozeman/bignumber.js-nolookahead.git": { + "dev": true + }, + "node_modules/truffle-hdwallet-provider-privkey/node_modules/web3/node_modules/bignumber.js": { + "resolved": "node_modules/truffle-hdwallet-provider-privkey/node_modules/web3/bignumber.js@git+https:/github.com/frozeman/bignumber.js-nolookahead.git", + "link": true + }, "node_modules/ts-essentials": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-1.0.4.tgz", @@ -23860,12 +23860,7 @@ }, "dependencies": { "async-eventemitter": { - "version": "git+ssh://git@github.com/ahultgren/async-eventemitter.git#fa06e39e56786ba541c180061dbf2c0a5bbf951c", - "dev": true, - "from": "git+ssh://git@github.com/ahultgren/async-eventemitter.git#fa06e39e56786ba541c180061dbf2c0a5bbf951c", - "requires": { - "async": "^2.4.0" - } + "version": "file:node_modules/eth-block-tracker/async-eventemitter@github:ahultgren/async-eventemitter" }, "bn.js": { "version": "4.12.0", @@ -34854,11 +34849,6 @@ "web3-provider-engine": "^13.8.0" }, "dependencies": { - "bignumber.js": { - "version": "git+ssh://git@github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", - "dev": true, - "from": "git+ssh://git@github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" - }, "utf8": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", @@ -34876,6 +34866,11 @@ "utf8": "^2.1.1", "xhr2-cookies": "^1.1.0", "xmlhttprequest": "*" + }, + "dependencies": { + "bignumber.js": { + "version": "file:node_modules/truffle-hdwallet-provider-privkey/node_modules/web3/bignumber.js@git+https:/github.com/frozeman/bignumber.js-nolookahead.git" + } } } } diff --git a/package.json b/package.json index 711627f..b06b2ea 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "lint:contracts": "solhint \"contracts/**/*.sol\" \"apps/*/contracts/**/*.sol\"", "lint:contract-tests": "eslint apps/*/test", "lint:wrapper": "eslint lib/", - "test": "npm run test:token && npm run test:contributor && npm run test:contribution && npm run test:proposal", + "test": "hardhat test", "test:token": "cd apps/token && npm run test", "test:contributor": "cd apps/contributor && npm run test", "test:contribution": "cd apps/contribution && npm run test",