difftreelog
resolve merge conflict
in: master
3 files changed
.github/workflows/dev-build-tests_v2.ymldiffbeforeafterboth686869 - name: Run tests69 - name: Run tests70 working-directory: tests70 working-directory: tests71 run: |71 run: |72 yarn install72 yarn install73 yarn add mochawesome73 yarn add mochawesome74 echo "Ready to start tests"74 echo "Ready to start tests"75 node scripts/readyness.js75 node scripts/readyness.js76 echo "Ready to start tests"76 yarn polkadot-types77 yarn polkadot-types77 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}78 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}79 env:78 env:80 RPC_URL: http://127.0.0.1:9933/79 RPC_URL: http://127.0.0.1:9933/8180.github/workflows/node-only-update_v2.ymldiffbeforeafterboth158158159 - name: Run tests before Node Parachain upgrade159 - name: Run tests before Node Parachain upgrade160 working-directory: tests160 working-directory: tests161 run: |161 run: |162 yarn install162 yarn install163 yarn add mochawesome163 yarn add mochawesome164 node scripts/readyness.js164 node scripts/readyness.js165 echo "Ready to start tests"165 echo "Ready to start tests"166 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}166 yarn polkadot-types167 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}167 env:168 env:168 RPC_URL: http://127.0.0.1:9933/169 RPC_URL: http://127.0.0.1:9933/169170234235235 - name: Run tests after Node Parachain upgrade236 - name: Run tests after Node Parachain upgrade236 working-directory: tests237 working-directory: tests237 run: |238 run: |238 yarn install239 yarn install239 yarn add mochawesome240 yarn add mochawesome240 node scripts/readyness.js241 node scripts/readyness.js241 echo "Ready to start tests"242 echo "Ready to start tests"242 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}243 yarn polkadot-types244 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}243 env:245 env:244 RPC_URL: http://127.0.0.1:9933/246 RPC_URL: http://127.0.0.1:9933/245247tests/scripts/readyness.jsdiffbeforeafterboth6 await api.isReadyOrError;6 await api.isReadyOrError;778 const head = (await api.rpc.chain.getHeader()).number.toNumber();8 const head = (await api.rpc.chain.getHeader()).number.toNumber();9 await api.disconnect();9 if(head < 1) throw Error('No block #1');10 if(head < 1) throw Error('No block #1');101111 await api.disconnect();12}12}131314const sleep = time => {14const sleep = time => {