Skip to content

Commit

Permalink
solve CI issue
Browse files Browse the repository at this point in the history
  • Loading branch information
zorancuc committed Aug 18, 2021
1 parent 5d1fdd1 commit a89caaa
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup Node.js environment
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12'
check-latest: true
- name: Cache npm dependencies
uses: actions/cache@v1
with:
Expand All @@ -27,4 +30,4 @@ jobs:
- name: Install npm dependencies
run: npm install
- name: Run tests
run: npm run test:ci
run: npm run test:ci

This comment has been minimized.

Copy link
@jdkanani
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@
"description": "Contracts to facilitate transfer of assets between Ethereum Main Network and Matic Network, using security of Matic POS layer",
"main": "index.js",
"scripts": {
"testrpc": "npx hardhat node --port 9545",
"testrpc": "hardhat node --port 9545",
"template:process": "node scripts/process-templates.js",
"bor": "cd test-blockchain && bash run-docker.sh",
"bor:clean": "cd test-blockchain && bash stop-docker.sh",
"truffle": "truffle",
"build": "npx hardhat clean && npx hardhat compile",
"hardhat": "hardhat",
"build": "hardhat clean && hardhat compile",
"migrate:2": "truffle migrate --network root --f 2 --to 2",
"migrate:3": "truffle migrate --network child --f 3 --to 3",
"migrate:4": "truffle migrate --network root --f 4 --to 4",
"migrate:5": "truffle migrate --network child --f 5 --to 5",
"migrate": "npm run migrate:2 && npm run migrate:3 && npm run migrate:4 && npm run migrate:5",
"change-owners": "truffle exec scripts/change-owners.js",
"test": "npx hardhat test",
"test": "hardhat test",
"lint": "npm run lint:sol && npm run lint:js",
"lint:js": "eslint test/**/*.js",
"lint:sol:fix": "solium -d contracts/ --fix",
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PWD=$(pwd)

cleanup() {
echo "Cleaning up"
pkill -f ganache-cli
# pkill -f ganache-cli
cd $PWD/test-blockchain
bash stop-docker.sh
bash clean.sh
Expand All @@ -30,6 +30,7 @@ start_blockchain() {
}

# process templates
node --version
npm run template:process

echo "Starting our own testrpc instance"
Expand Down
4 changes: 2 additions & 2 deletions truffle-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ module.exports = {
network_id: '*', // match any network
skipDryRun: true,
gas: 7000000,
gasPrice: '0'
gasPrice: '900000000'
},
child: {
host: 'localhost',
port: 8545,
network_id: '*', // match any network
skipDryRun: true,
gas: 7000000,
gasPrice: '0'
gasPrice: '900000000'
},
mumbaiRoot: {
provider: () =>
Expand Down

0 comments on commit a89caaa

Please sign in to comment.