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
--- 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
modified.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