git.delta.rocks / unique-network / refs/commits / 4f6c04115e1f

difftreelog

remove symbols related to merge conflicts

Alexander Aksenov2022-09-14parent: #feed425.patch.diff
in: master

3 files changed

modified.github/workflows/dev-build-tests_v2.ymldiffbeforeafterboth
72 yarn install72 yarn install
73 yarn add mochawesome73 yarn add mochawesome
74 node scripts/readyness.js74 node scripts/readyness.js
75<<<<<<< HEAD:.github/workflows/dev-build-tests_v2.yml
76 echo "Ready to start tests"75 echo "Ready to start tests"
77=======
78>>>>>>> develop:.github/workflows/dev-build-tests_v2.yml
79 yarn polkadot-types76 yarn polkadot-types
80 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:
modified.github/workflows/market-test_v2.ymldiffbeforeafterboth
174 - name: Stop running containers174 - name: Stop running containers
175 if: always() # run this step always175 if: always() # run this step always
176 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 --volumes
177# run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down
178177
179 - name: Remove builder cache178 - name: Remove builder cache
180 if: always() # run this step always179 if: always() # run this step always
modified.github/workflows/xcm-tests_v2.ymldiffbeforeafterboth
60 matrix:60 matrix:
61 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}61 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}
6262
63<<<<<<< HEAD
64=======
65
66>>>>>>> develop
67 steps:63 steps:
68 - name: Skip if pull request is in Draft64 - name: Skip if pull request is in Draft
69 if: github.event.pull_request.draft == true65 if: github.event.pull_request.draft == true