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

difftreelog

Merge branch 'develop' into CI-43-try-runtime

Alexander Aksenov2022-08-18parents: #d49036f #032326e.patch.diff
in: master

10 files changed

modified.docker/Dockerfile-try-runtimediffbeforeafterboth
--- a/.docker/Dockerfile-try-runtime
+++ b/.docker/Dockerfile-try-runtime
@@ -34,17 +34,12 @@
 
 ARG PROFILE=release
 ARG FEATURE=
-ARG REPO_URL=
-ARG BRANCH=
 ARG FORK_FROM=
 
+COPY . /unique_parachain
 WORKDIR /unique_parachain
 
 
 RUN echo "Requested features: $FEATURE\n" && \
     echo "Fork from: $FORK_FROM\n" && \
-    echo "Repositry URL: $REPO_URL\n" && \
-    echo "Branch: $BRANCH\n" && \
-    git clone $REPO_URL -b $BRANCH . && \
     cargo run --features=$FEATURE --release -- try-runtime on-runtime-upgrade live --uri $FORK_FROM
- 
\ No newline at end of file
modified.docker/docker-compose.try-runtime.j2diffbeforeafterboth
--- a/.docker/docker-compose.try-runtime.j2
+++ b/.docker/docker-compose.try-runtime.j2
@@ -5,8 +5,6 @@
     build:
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "BRANCH={{ BRANCH }}"
-        - "REPO_URL={{ REPO_URL }}"
         - "FEATURE={{ FEATURE }}"
         - "FORK_FROM={{ FORK_FROM }}"
 
modified.github/workflows/build-test-master.ymldiffbeforeafterboth
--- a/.github/workflows/build-test-master.yml
+++ b/.github/workflows/build-test-master.yml
@@ -1,4 +1,4 @@
-name: MASTER - Build & Test
+name: Yarn test para
 
 # Controls when the action will run.
 on:
@@ -19,15 +19,19 @@
 env:
   REPO_URL: ${{ github.server_url }}/${{ github.repository }}
 
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
 
   master-build-and-test:
     # The type of runner that the job will run on
-    runs-on: self-hosted-ci
+    runs-on: [self-hosted-ci,large]
+    timeout-minutes: 1380
 
-
-    name: ${{ matrix.network }} - Build and Test
+    name: ${{ matrix.network }}
 
     continue-on-error: true         #Do not stop testing of matrix runs failed.
 
modified.github/workflows/codestyle.ymldiffbeforeafterboth
--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@ -10,6 +10,10 @@
       - synchronize
       - ready_for_review
 
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   rustfmt:
     runs-on: self-hosted-ci
@@ -47,7 +51,7 @@
   clippy:
     if: ${{ false }}
     runs-on: self-hosted-ci
-
+      
     steps:
       - name: Skip if pull request is in Draft
         # `if: github.event.pull_request.draft == true` should be kept here, at
modified.github/workflows/fork-update-withdata.ymldiffbeforeafterboth
before · .github/workflows/fork-update-withdata.yml
1name: Fork Parachain update with data23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6  pull_request:7    branches:8      - master9    types:10      - opened11      - reopened12      - synchronize   #commit(s) pushed to the pull request13      - ready_for_review1415  # Allows you to run this workflow manually from the Actions tab16  workflow_dispatch:1718#Define Workflow variables19env:20  REPO_URL: ${{ github.server_url }}/${{ github.repository }}2122# A workflow run is made up of one or more jobs that can run sequentially or in parallel23jobs:2425  fork-update-withdata:26    # The type of runner that the job will run on27    runs-on: self-hosted-ci2829    name: ${{ matrix.network }} Fork Parachain with data3031    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.3233    strategy:34      matrix:35        include:36          - network: Opal37            features: opal-runtime38            runtime: opal39            fork_from_address: wss://eu-ws-opal.unique.network:44340          - network: Quartz41            features: quartz-runtime42            runtime: quartz43            fork_from_address: wss://eu-ws-quartz.unique.network:44344          - network: Unique45            features: unique-runtime46            runtime: unique47            fork_from_address: wss://eu-ws.unique.network:4434849    steps:50      - name: Skip if pull request is in Draft51        # `if: github.event.pull_request.draft == true` should be kept here, at52        # the step level, rather than at the job level. The latter is not53        # recommended because when the PR is moved from "Draft" to "Ready to54        # review" the workflow will immediately be passing (since it was skipped),55        # even though it hasn't actually ran, since it takes a few seconds for56        # the workflow to start. This is also disclosed in:57        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1758        # That scenario would open an opportunity for the check to be bypassed:59        # 1. Get your PR approved60        # 2. Move it to Draft61        # 3. Push whatever commits you want62        # 4. Move it to "Ready for review"; now the workflow is passing (it was63        #    skipped) and "Check reviews" is also passing (it won't be updated64        #    until the workflow is finished)65        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/forking/docker-compose.tmp-fork.j283          output_file: .docker/forking/docker-compose.${{ matrix.network }}.yml84          variables: |85            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git86            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}87            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}88            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}89            FEATURE=${{ matrix.features }}90            RUNTIME=${{ matrix.runtime }}91            BRANCH=${{ github.head_ref }}92            FORK_FROM=${{ matrix.fork_from_address }}9394      - name: Show build configuration95        run: cat .docker/forking/docker-compose.${{ matrix.network }}.yml9697      - name: Generate launch-config-fork.json98        uses: cuchi/jinja2-action@v1.2.099        with:100          template: .docker/forking/launch-config-fork.j2101          output_file: .docker/forking/launch-config-fork.json102          variables: |103            FEATURE=${{ matrix.features }}104            RUNTIME=${{ matrix.runtime }}105106      - name: Show launch-config-fork configuration107        run: cat .docker/forking/launch-config-fork.json108109110      - name: Build the stack111        run: docker-compose -f ".docker/forking/docker-compose-fork.yaml" -f ".docker/forking/docker-compose.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300112113      - name: Check if docker logs consist logs related to Runtime Upgrade testing.114        if: success()115        run: |116            counter=160117            function do_docker_logs {118                docker logs --details parachain-fork  2>&1119            }120            function is_started {121                echo "Check Docker logs"122                DOCKER_LOGS=$(do_docker_logs)123                if [[ ${DOCKER_LOGS} = *"🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"* ]];then124                     echo "🛸 PARACHAINS' RUNTIME UPGRADE TESTING COMPLETE 🛸"125                     return 0126                     exit 0127                fi128                     echo "Function is_started: Return 1"129                     return 1130            }131            while ! is_started; do132                echo "Waiting for special message in log files "133                sleep 30s134                counter=$(( $counter - 1 ))135                echo "Counter: $counter"136                if [ "$counter" -gt "0" ]; then137                     continue138                else139                     break140                fi141            done142            exit 1143        shell: bash144145      - name: Collect Docker Logs146        if: success() || failure()147        uses: jwalton/gh-docker-logs@v2.2.0148        with:149          dest: './fork-parachain-update-withdata-logs.${{ matrix.features }}'150          images: 'parachain-fork' 151152      - name: Tar logs153        if: success() || failure()154        run: tar cvzf ./fork-parachain-update-withdata-logs.${{ matrix.features }}.tgz ./fork-parachain-update-withdata-logs.${{ matrix.features }}155156      - name: Upload logs to GitHub157        if: success() || failure()158        uses: actions/upload-artifact@master159        with:160          name: fork-parachain-update-withdata-logs.${{ matrix.features }}.tgz161          path: ./fork-parachain-update-withdata-logs.${{ matrix.features }}.tgz162163      - name: Stop running containers164        if: always()                   # run this step always165        run: docker-compose -f ".docker/forking/docker-compose-fork.yaml" -f ".docker/forking/docker-compose.${{ matrix.network }}.yml" down
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -1,4 +1,4 @@
-name: Forkless Parachain update with no data
+name: Upgrade nodata
 
 # Controls when the action will run.
 on:
@@ -19,6 +19,10 @@
 env:
   REPO_URL: ${{ github.server_url }}/${{ github.repository }}
 
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
 
@@ -29,6 +33,7 @@
     runs-on: self-hosted-ci
     outputs:
       matrix: ${{ steps.create_matrix.outputs.matrix }}
+
     steps:
       
       - name: Clean Workspace
@@ -56,9 +61,13 @@
   forkless-update-nodata:
     needs: prepare-execution-marix
     # The type of runner that the job will run on
-    runs-on: self-hosted-ci
+    runs-on: [self-hosted-ci,medium]
+    
+    
 
-    name: ${{ matrix.network }} - Forkless Parachain Upgrade NO data
+    timeout-minutes: 1380
+
+    name: ${{ matrix.network }}
 
     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.
 
modified.github/workflows/node_build_test.ymldiffbeforeafterboth
--- a/.github/workflows/node_build_test.yml
+++ b/.github/workflows/node_build_test.yml
@@ -1,4 +1,4 @@
-name: Develop - Build & test
+name: Yarn test dev
 
 # Controls when the action will run.
 on:
@@ -19,13 +19,18 @@
 env:
   REPO_URL: ${{ github.server_url }}/${{ github.repository }}
 
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   dev_build_test:
     # The type of runner that the job will run on
-    runs-on: self-hosted-ci
+    runs-on: [self-hosted-ci,medium]
+    timeout-minutes: 1380
 
-    name: Build Container, Spin it Up an test
+    name: ${{ matrix.network }}
 
     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.
 
modified.github/workflows/tests_codestyle.ymldiffbeforeafterboth
--- a/.github/workflows/tests_codestyle.yml
+++ b/.github/workflows/tests_codestyle.yml
@@ -10,6 +10,10 @@
       - synchronize
       - ready_for_review
 
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   code_style:
     runs-on: self-hosted-ci
modified.github/workflows/try-runtime.ymldiffbeforeafterboth
--- a/.github/workflows/try-runtime.yml
+++ b/.github/workflows/try-runtime.yml
@@ -1,4 +1,4 @@
-name: Try Runtime
+name: try-runtime
 
 # Controls when the action will run.
 on:
@@ -19,26 +19,30 @@
 env:
   REPO_URL: ${{ github.server_url }}/${{ github.repository }}
 
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   try-runtime:
     # The type of runner that the job will run on
     runs-on: self-hosted-ci
-
-    name: ${{ matrix.network }} - Try-runtime
+    
+    name: ${{ matrix.network }}
 
     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.
 
     strategy:
       matrix:
         include:
-          - network: Opal
+          - network: opal
             features: try-runtime,opal-runtime
             fork_from_address: wss://eu-ws-opal.unique.network:443
-          - network: Quartz
+          - network: quartz
             features: try-runtime,quartz-runtime
             fork_from_address: wss://eu-ws-quartz.unique.network:443
-          - network: Unique
+          - network: unique
             features: try-runtime,unique-runtime
             fork_from_address: wss://eu-ws.unique.network:443
 
@@ -79,37 +83,15 @@
           template: .docker/docker-compose.try-runtime.j2
           output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml
           variables: |
-            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             FEATURE=${{ matrix.features }}
-            BRANCH=${{ github.head_ref }}
             FORK_FROM=${{ matrix.fork_from_address }}
 
       - name: Show build configuration
         run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml
 
-
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300
-
-
-      - name: Collect Docker Logs
-        if: success() || failure()
-        uses: jwalton/gh-docker-logs@v2.2.0
-        with:
-          dest: './try-runtime-logs.${{ matrix.features }}'
-          images: 'try-runtime' 
-
-      - name: Tar logs
-        if: success() || failure()
-        run: tar cvzf ./try-runtime-logs.${{ matrix.features }}.tgz ./try-runtime-logs.${{ matrix.features }}
-
-      - name: Upload logs to GitHub
-        if: success() || failure()
-        uses: actions/upload-artifact@master
-        with:
-          name: try-runtime-logs.${{ matrix.features }}.tgz
-          path: ./try-runtime-logs.${{ matrix.features }}.tgz
+        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" up -d --build  --force-recreate --timeout 300 --remove-orphans
 
       - name: Stop running containers
         if: always()                   # run this step always
modifiednode/cli/Cargo.tomldiffbeforeafterboth
--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -266,6 +266,7 @@
 
 [dependencies.opal-runtime]
 path = '../../runtime/opal'
+optional = true
 
 [dependencies.up-data-structs]
 path = "../../primitives/data-structs"
@@ -320,11 +321,15 @@
 rmrk-rpc = { path = "../../primitives/rmrk-rpc" }
 
 [features]
-default = []
+default = ["opal-runtime"]
 runtime-benchmarks = [
     'unique-runtime?/runtime-benchmarks',
     'quartz-runtime?/runtime-benchmarks',
     'opal-runtime/runtime-benchmarks',
     'polkadot-service/runtime-benchmarks',
 ]
-try-runtime = []
+try-runtime = [
+    'unique-runtime?/try-runtime',
+    'quartz-runtime?/try-runtime',
+    'opal-runtime?/try-runtime',
+]