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
--- a/.github/workflows/fork-update-withdata.yml
+++ b/.github/workflows/fork-update-withdata.yml
@@ -1,4 +1,4 @@
-name: Fork Parachain update with data
+name: Upgrade replica
 
 # Controls when the action will run.
 on:
@@ -19,14 +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:
 
   fork-update-withdata:
     # 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 }} Fork Parachain with data
+    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/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
before · .github/workflows/try-runtime.yml
1name: Try Runtime23# 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:24  try-runtime:25    # The type of runner that the job will run on26    runs-on: self-hosted-ci2728    name: ${{ matrix.network }} - Try-runtime2930    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.3132    strategy:33      matrix:34        include:35          - network: Opal36            features: try-runtime,opal-runtime37            fork_from_address: wss://eu-ws-opal.unique.network:44338          - network: Quartz39            features: try-runtime,quartz-runtime40            fork_from_address: wss://eu-ws-quartz.unique.network:44341          - network: Unique42            features: try-runtime,unique-runtime43            fork_from_address: wss://eu-ws.unique.network:4434445    steps:46      - name: Skip if pull request is in Draft47        # `if: github.event.pull_request.draft == true` should be kept here, at48        # the step level, rather than at the job level. The latter is not49        # recommended because when the PR is moved from "Draft" to "Ready to50        # review" the workflow will immediately be passing (since it was skipped),51        # even though it hasn't actually ran, since it takes a few seconds for52        # the workflow to start. This is also disclosed in:53        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1754        # That scenario would open an opportunity for the check to be bypassed:55        # 1. Get your PR approved56        # 2. Move it to Draft57        # 3. Push whatever commits you want58        # 4. Move it to "Ready for review"; now the workflow is passing (it was59        #    skipped) and "Check reviews" is also passing (it won't be updated60        #    until the workflow is finished)61        if: github.event.pull_request.draft == true62        run: exit 1636465      - name: Clean Workspace66        uses: AutoModality/action-clean@v1.1.06768      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it69      - uses: actions/checkout@v370        with:71          ref: ${{ github.head_ref }}  #Checking out head commit7273      - name: Read .env file74        uses: xom9ikk/dotenv@v1.0.27576      - name: Generate ENV related extend file for docker-compose77        uses: cuchi/jinja2-action@v1.2.078        with:79          template: .docker/docker-compose.try-runtime.j280          output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml81          variables: |82            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git83            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}84            FEATURE=${{ matrix.features }}85            BRANCH=${{ github.head_ref }}86            FORK_FROM=${{ matrix.fork_from_address }}8788      - name: Show build configuration89        run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml909192      - name: Build the stack93        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 300949596      - name: Collect Docker Logs97        if: success() || failure()98        uses: jwalton/gh-docker-logs@v2.2.099        with:100          dest: './try-runtime-logs.${{ matrix.features }}'101          images: 'try-runtime' 102103      - name: Tar logs104        if: success() || failure()105        run: tar cvzf ./try-runtime-logs.${{ matrix.features }}.tgz ./try-runtime-logs.${{ matrix.features }}106107      - name: Upload logs to GitHub108        if: success() || failure()109        uses: actions/upload-artifact@master110        with:111          name: try-runtime-logs.${{ matrix.features }}.tgz112          path: ./try-runtime-logs.${{ matrix.features }}.tgz113114      - name: Stop running containers115        if: always()                   # run this step always116        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" down
after · .github/workflows/try-runtime.yml
1name: try-runtime23# 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 }}2122concurrency: 23  group: ${{ github.workflow }}-${{ github.ref }}24  cancel-in-progress: true2526# A workflow run is made up of one or more jobs that can run sequentially or in parallel27jobs:28  try-runtime:29    # The type of runner that the job will run on30    runs-on: self-hosted-ci31    32    name: ${{ matrix.network }}3334    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.3536    strategy:37      matrix:38        include:39          - network: opal40            features: try-runtime,opal-runtime41            fork_from_address: wss://eu-ws-opal.unique.network:44342          - network: quartz43            features: try-runtime,quartz-runtime44            fork_from_address: wss://eu-ws-quartz.unique.network:44345          - network: unique46            features: try-runtime,unique-runtime47            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 1676869      - name: Clean Workspace70        uses: AutoModality/action-clean@v1.1.07172      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it73      - uses: actions/checkout@v374        with:75          ref: ${{ github.head_ref }}  #Checking out head commit7677      - name: Read .env file78        uses: xom9ikk/dotenv@v1.0.27980      - name: Generate ENV related extend file for docker-compose81        uses: cuchi/jinja2-action@v1.2.082        with:83          template: .docker/docker-compose.try-runtime.j284          output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml85          variables: |86            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}87            FEATURE=${{ matrix.features }}88            FORK_FROM=${{ matrix.fork_from_address }}8990      - name: Show build configuration91        run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml9293      - name: Build the stack94        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-orphans9596      - name: Stop running containers97        if: always()                   # run this step always98        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" down
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',
+]