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

--- a/.github/workflows/dev-build-tests_v2.yml
+++ b/.github/workflows/dev-build-tests_v2.yml
@@ -72,10 +72,7 @@
           yarn install
           yarn add mochawesome
           node scripts/readyness.js
-<<<<<<< HEAD:.github/workflows/dev-build-tests_v2.yml
           echo "Ready to start tests"
-=======
->>>>>>> develop:.github/workflows/dev-build-tests_v2.yml
           yarn polkadot-types
           NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
         env:

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

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