difftreelog
remove symbols related to merge conflicts
in: master
3 files changed
.github/workflows/dev-build-tests_v2.ymldiffbeforeafterboth--- 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:
.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.ymldiffbeforeafterboth1name: xcm-tests23# Controls when the action will run.4on:5 # Allows you to run this workflow manually from the Actions tab6 workflow_call:78#Define Workflow variables9env:10 REPO_URL: ${{ github.server_url }}/${{ github.repository }}111213# A workflow run is made up of one or more jobs that can run sequentially or in parallel14jobs:1516 prepare-execution-marix:1718 name: Prepare execution matrix1920# needs: [xcm-testnet-build]2122 runs-on: XL23 outputs:24 matrix: ${{ steps.create_matrix.outputs.matrix }}2526 steps:2728 - name: Clean Workspace29 uses: AutoModality/action-clean@v1.1.03031 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it32 - uses: actions/checkout@v333 with:34 ref: ${{ github.head_ref }} #Checking out head commit3536 - name: Read .env file37 uses: xom9ikk/dotenv@v1.0.23839 - name: Create Execution matrix40 uses: fabiocaccamo/create-matrix-action@v241 id: create_matrix42 with:43 matrix: |44 network {opal}, runtime {opal}, features {opal-runtime}, runtest {testXcmOpal}45 network {quartz}, runtime {quartz}, features {quartz-runtime}, runtest {testXcmQuartz}46 network {unique}, runtime {unique}, features {unique-runtime}, runtest {testXcmUnique}4748 xcm-tests:49 needs: prepare-execution-marix50 # The type of runner that the job will run on51 runs-on: [XL]5253 timeout-minutes: 6005455 name: ${{ matrix.network }}5657 continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.5859 strategy:60 matrix:61 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}6263<<<<<<< HEAD64=======6566>>>>>>> develop67 steps:68 - name: Skip if pull request is in Draft69 if: github.event.pull_request.draft == true70 run: exit 17172 - name: Clean Workspace73 uses: AutoModality/action-clean@v1.1.07475 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it76 - uses: actions/checkout@v377 with:78 ref: ${{ github.head_ref }} #Checking out head commit7980 - name: Read .env file81 uses: xom9ikk/dotenv@v1.0.28283 - name: Generate ENV related extend file for docker-compose84 uses: cuchi/jinja2-action@v1.2.085 with:86 template: .docker/docker-compose.tmp-xcm-tests.j287 output_file: .docker/docker-compose.xcm-tests.${{ matrix.network }}.yml88 variables: |89 NETWORK=${{ matrix.network }}9091 - name: Show build configuration92 run: cat .docker/docker-compose.xcm-tests.${{ matrix.network }}.yml9394 - uses: actions/setup-node@v395 with:96 node-version: 169798 - name: Build the stack99 run: docker-compose -f ".docker/docker-compose.xcm-tests.${{ matrix.network }}.yml" up -d --remove-orphans --force-recreate --timeout 300100101 # π POLKADOT LAUNCH COMPLETE π102 - name: Check if docker logs consist messages related to testing of xcm tests 103 if: success()104 run: |105 counter=160106 function check_container_status {107 docker inspect -f {{.State.Running}} xcm-${{ matrix.network }}-testnet-local108 }109 function do_docker_logs {110 docker logs --details xcm-${{ matrix.network }}-testnet-local 2>&1111 }112 function is_started {113 if [ "$(check_container_status)" == "true" ]; then114 echo "Container: xcm-${{ matrix.network }}-testnet-local RUNNING";115 echo "Check Docker logs"116 DOCKER_LOGS=$(do_docker_logs)117 if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then118 echo "π POLKADOT LAUNCH COMPLETE π"119 return 0120 else121 echo "Message not found in logs output, repeating..."122 return 1123 fi124 else125 echo "Container xcm-${{ matrix.network }}-testnet-local NOT RUNNING"126 echo "Halting all future checks"127 exit 1128 fi129 echo "something goes wrong"130 exit 1131 }132 while ! is_started; do133 echo "Waiting for special message in log files "134 sleep 30s135 counter=$(( $counter - 1 ))136 echo "Counter: $counter"137 if [ "$counter" -gt "0" ]; then138 continue139 else140 break141 fi142 done143 echo "Halting script"144 exit 0145 shell: bash146147 - name: Run XCM tests 148 working-directory: tests149 run: |150 yarn install151 yarn add mochawesome152 node scripts/readyness.js153 echo "Ready to start tests"154 NOW=$(date +%s) && yarn ${{ matrix.runtest }} --reporter mochawesome --reporter-options reportFilename=test-${NOW}155156 - name: XCM Test Report157 uses: phoenix-actions/test-reporting@v8158 id: test-report159 if: success() || failure() # run this step even if previous step failed160 with:161 name: XCM Tests ${{ matrix.network }} # Name of the check run which will be created162 path: tests/mochawesome-report/test-*.json # Path to test results163 reporter: mochawesome-json164 fail-on-error: 'false'165166 - name: Stop running containers167 if: always() # run this step always168 run: docker-compose -f ".docker/docker-compose.xcm-tests.${{ matrix.network }}.yml" down169170 - name: Clean Workspace171 if: always()172 uses: AutoModality/action-clean@v1.1.0173174 - name: Remove builder cache175 if: always() # run this step always176 run: |177 docker system prune -a -f1781name: xcm-tests23# Controls when the action will run.4on:5 # Allows you to run this workflow manually from the Actions tab6 workflow_call:78#Define Workflow variables9env:10 REPO_URL: ${{ github.server_url }}/${{ github.repository }}111213# A workflow run is made up of one or more jobs that can run sequentially or in parallel14jobs:1516 prepare-execution-marix:1718 name: Prepare execution matrix1920# needs: [xcm-testnet-build]2122 runs-on: XL23 outputs:24 matrix: ${{ steps.create_matrix.outputs.matrix }}2526 steps:2728 - name: Clean Workspace29 uses: AutoModality/action-clean@v1.1.03031 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it32 - uses: actions/checkout@v333 with:34 ref: ${{ github.head_ref }} #Checking out head commit3536 - name: Read .env file37 uses: xom9ikk/dotenv@v1.0.23839 - name: Create Execution matrix40 uses: fabiocaccamo/create-matrix-action@v241 id: create_matrix42 with:43 matrix: |44 network {opal}, runtime {opal}, features {opal-runtime}, runtest {testXcmOpal}45 network {quartz}, runtime {quartz}, features {quartz-runtime}, runtest {testXcmQuartz}46 network {unique}, runtime {unique}, features {unique-runtime}, runtest {testXcmUnique}4748 xcm-tests:49 needs: prepare-execution-marix50 # The type of runner that the job will run on51 runs-on: [XL]5253 timeout-minutes: 6005455 name: ${{ matrix.network }}5657 continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.5859 strategy:60 matrix:61 include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}6263 steps:64 - name: Skip if pull request is in Draft65 if: github.event.pull_request.draft == true66 run: exit 16768 - name: Clean Workspace69 uses: AutoModality/action-clean@v1.1.07071 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it72 - uses: actions/checkout@v373 with:74 ref: ${{ github.head_ref }} #Checking out head commit7576 - name: Read .env file77 uses: xom9ikk/dotenv@v1.0.27879 - name: Generate ENV related extend file for docker-compose80 uses: cuchi/jinja2-action@v1.2.081 with:82 template: .docker/docker-compose.tmp-xcm-tests.j283 output_file: .docker/docker-compose.xcm-tests.${{ matrix.network }}.yml84 variables: |85 NETWORK=${{ matrix.network }}8687 - name: Show build configuration88 run: cat .docker/docker-compose.xcm-tests.${{ matrix.network }}.yml8990 - uses: actions/setup-node@v391 with:92 node-version: 169394 - name: Build the stack95 run: docker-compose -f ".docker/docker-compose.xcm-tests.${{ matrix.network }}.yml" up -d --remove-orphans --force-recreate --timeout 3009697 # π POLKADOT LAUNCH COMPLETE π98 - name: Check if docker logs consist messages related to testing of xcm tests 99 if: success()100 run: |101 counter=160102 function check_container_status {103 docker inspect -f {{.State.Running}} xcm-${{ matrix.network }}-testnet-local104 }105 function do_docker_logs {106 docker logs --details xcm-${{ matrix.network }}-testnet-local 2>&1107 }108 function is_started {109 if [ "$(check_container_status)" == "true" ]; then110 echo "Container: xcm-${{ matrix.network }}-testnet-local RUNNING";111 echo "Check Docker logs"112 DOCKER_LOGS=$(do_docker_logs)113 if [[ ${DOCKER_LOGS} = *"POLKADOT LAUNCH COMPLETE"* ]];then114 echo "π POLKADOT LAUNCH COMPLETE π"115 return 0116 else117 echo "Message not found in logs output, repeating..."118 return 1119 fi120 else121 echo "Container xcm-${{ matrix.network }}-testnet-local NOT RUNNING"122 echo "Halting all future checks"123 exit 1124 fi125 echo "something goes wrong"126 exit 1127 }128 while ! is_started; do129 echo "Waiting for special message in log files "130 sleep 30s131 counter=$(( $counter - 1 ))132 echo "Counter: $counter"133 if [ "$counter" -gt "0" ]; then134 continue135 else136 break137 fi138 done139 echo "Halting script"140 exit 0141 shell: bash142143 - name: Run XCM tests 144 working-directory: tests145 run: |146 yarn install147 yarn add mochawesome148 node scripts/readyness.js149 echo "Ready to start tests"150 NOW=$(date +%s) && yarn ${{ matrix.runtest }} --reporter mochawesome --reporter-options reportFilename=test-${NOW}151152 - name: XCM Test Report153 uses: phoenix-actions/test-reporting@v8154 id: test-report155 if: success() || failure() # run this step even if previous step failed156 with:157 name: XCM Tests ${{ matrix.network }} # Name of the check run which will be created158 path: tests/mochawesome-report/test-*.json # Path to test results159 reporter: mochawesome-json160 fail-on-error: 'false'161162 - name: Stop running containers163 if: always() # run this step always164 run: docker-compose -f ".docker/docker-compose.xcm-tests.${{ matrix.network }}.yml" down165166 - name: Clean Workspace167 if: always()168 uses: AutoModality/action-clean@v1.1.0169170 - name: Remove builder cache171 if: always() # run this step always172 run: |173 docker system prune -a -f174