difftreelog
remove symbols related to merge conflicts
in: master
3 files changed
.github/workflows/dev-build-tests_v2.ymldiffbeforeafterboth72 yarn install72 yarn install73 yarn add mochawesome73 yarn add mochawesome74 node scripts/readyness.js74 node scripts/readyness.js75<<<<<<< HEAD:.github/workflows/dev-build-tests_v2.yml76 echo "Ready to start tests"75 echo "Ready to start tests"77=======78>>>>>>> develop:.github/workflows/dev-build-tests_v2.yml79 yarn polkadot-types76 yarn polkadot-types80 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}77 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}81 env:78 env:.github/workflows/market-test_v2.ymldiffbeforeafterboth174 - name: Stop running containers174 - name: Stop running containers175 if: always() # run this step always175 if: always() # run this step always176 run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down --volumes176 run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down --volumes177# run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down178177179 - name: Remove builder cache178 - name: Remove builder cache180 if: always() # run this step always179 if: always() # run this step always.github/workflows/xcm-tests_v2.ymldiffbeforeafterboth60 matrix:60 matrix:61 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}61 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}626263<<<<<<< HEAD64=======6566>>>>>>> develop67 steps:63 steps:68 - name: Skip if pull request is in Draft64 - name: Skip if pull request is in Draft69 if: github.event.pull_request.draft == true65 if: github.event.pull_request.draft == true