difftreelog
resolve merge conflict
in: master
3 files changed
.github/workflows/dev-build-tests_v2.ymldiffbeforeafterboth1name: yarn test dev23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6 workflow_call:789#Define Workflow variables10env:11 REPO_URL: ${{ github.server_url }}/${{ github.repository }}121314# A workflow run is made up of one or more jobs that can run sequentially or in parallel15jobs:16 17 dev_build_int_tests:18 # The type of runner that the job will run on19 runs-on: [self-hosted-ci,medium]20 timeout-minutes: 13802122 name: ${{ matrix.network }}2324 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.2526 strategy:27 matrix:28 include:29 - network: "opal"30 features: "opal-runtime"31 - network: "quartz"32 features: "quartz-runtime"33 - network: "unique"34 features: "unique-runtime"3536 steps:3738 - name: Clean Workspace39 uses: AutoModality/action-clean@v1.1.04041 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it42 - uses: actions/checkout@v343 with:44 ref: ${{ github.head_ref }} #Checking out head commit4546 - name: Read .env file47 uses: xom9ikk/dotenv@v1.0.24849 - name: Generate ENV related extend file for docker-compose50 uses: cuchi/jinja2-action@v1.2.051 with:52 template: .docker/docker-compose.tmp-dev.j253 output_file: .docker/docker-compose.${{ matrix.network }}.yml54 variables: |55 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}56 FEATURE=${{ matrix.features }}57 5859 - name: Show build configuration60 run: cat .docker/docker-compose.${{ matrix.network }}.yml6162 - name: Build the stack63 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans6465 - uses: actions/setup-node@v366 with:67 node-version: 166869 - name: Run tests70 working-directory: tests71 run: |72 yarn install73 yarn add mochawesome74 echo "Ready to start tests"75 node scripts/readyness.js76 echo "Ready to start tests"77 yarn polkadot-types78 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}79 env:80 RPC_URL: http://127.0.0.1:9933/8182 - name: Test Report83 uses: phoenix-actions/test-reporting@v884 id: test-report85 if: success() || failure() # run this step even if previous step failed86 with:87 name: int test results - ${{ matrix.network }} # Name of the check run which will be created88 path: tests/mochawesome-report/test-*.json # Path to test results89 reporter: mochawesome-json90 fail-on-error: 'false'9192 - name: Read output variables93 run: |94 echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"9596 - name: Stop running containers97 if: always() # run this step always98 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down1name: yarn test dev23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6 workflow_call:789#Define Workflow variables10env:11 REPO_URL: ${{ github.server_url }}/${{ github.repository }}121314# A workflow run is made up of one or more jobs that can run sequentially or in parallel15jobs:16 17 dev_build_int_tests:18 # The type of runner that the job will run on19 runs-on: [self-hosted-ci,medium]20 timeout-minutes: 13802122 name: ${{ matrix.network }}2324 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.2526 strategy:27 matrix:28 include:29 - network: "opal"30 features: "opal-runtime"31 - network: "quartz"32 features: "quartz-runtime"33 - network: "unique"34 features: "unique-runtime"3536 steps:3738 - name: Clean Workspace39 uses: AutoModality/action-clean@v1.1.04041 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it42 - uses: actions/checkout@v343 with:44 ref: ${{ github.head_ref }} #Checking out head commit4546 - name: Read .env file47 uses: xom9ikk/dotenv@v1.0.24849 - name: Generate ENV related extend file for docker-compose50 uses: cuchi/jinja2-action@v1.2.051 with:52 template: .docker/docker-compose.tmp-dev.j253 output_file: .docker/docker-compose.${{ matrix.network }}.yml54 variables: |55 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}56 FEATURE=${{ matrix.features }}57 5859 - name: Show build configuration60 run: cat .docker/docker-compose.${{ matrix.network }}.yml6162 - name: Build the stack63 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans6465 - uses: actions/setup-node@v366 with:67 node-version: 166869 - name: Run tests70 working-directory: tests71 run: |72 yarn install73 yarn add mochawesome74 echo "Ready to start tests"75 node scripts/readyness.js76 yarn polkadot-types77 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}78 env:79 RPC_URL: http://127.0.0.1:9933/8081 - name: Test Report82 uses: phoenix-actions/test-reporting@v883 id: test-report84 if: success() || failure() # run this step even if previous step failed85 with:86 name: int test results - ${{ matrix.network }} # Name of the check run which will be created87 path: tests/mochawesome-report/test-*.json # Path to test results88 reporter: mochawesome-json89 fail-on-error: 'false'9091 - name: Read output variables92 run: |93 echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"9495 - name: Stop running containers96 if: always() # run this step always97 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down.github/workflows/node-only-update_v2.ymldiffbeforeafterboth--- a/.github/workflows/node-only-update_v2.yml
+++ b/.github/workflows/node-only-update_v2.yml
@@ -163,6 +163,7 @@
yarn add mochawesome
node scripts/readyness.js
echo "Ready to start tests"
+ yarn polkadot-types
NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
env:
RPC_URL: http://127.0.0.1:9933/
@@ -239,6 +240,7 @@
yarn add mochawesome
node scripts/readyness.js
echo "Ready to start tests"
+ yarn polkadot-types
NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
env:
RPC_URL: http://127.0.0.1:9933/
tests/scripts/readyness.jsdiffbeforeafterboth--- a/tests/scripts/readyness.js
+++ b/tests/scripts/readyness.js
@@ -6,9 +6,9 @@
await api.isReadyOrError;
const head = (await api.rpc.chain.getHeader()).number.toNumber();
+ await api.disconnect();
if(head < 1) throw Error('No block #1');
- await api.disconnect();
}
const sleep = time => {