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.ymldiffbeforeafterboth--- a/.github/workflows/market-test_v2.yml
+++ b/.github/workflows/market-test_v2.yml
@@ -174,7 +174,6 @@
- name: Stop running containers
if: always() # run this step always
run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down --volumes
-# run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down
- name: Remove builder cache
if: always() # run this step always
.github/workflows/xcm-tests_v2.ymldiffbeforeafterboth--- a/.github/workflows/xcm-tests_v2.yml
+++ b/.github/workflows/xcm-tests_v2.yml
@@ -60,10 +60,6 @@
matrix:
include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}
-<<<<<<< HEAD
-=======
-
->>>>>>> develop
steps:
- name: Skip if pull request is in Draft
if: github.event.pull_request.draft == true