git.delta.rocks / unique-network / refs/commits / 04959868b343

difftreelog

Update due to found polkadot-launch requirements for upgrade.

Alexander Aksenov2022-08-10parent: #0098859.patch.diff
in: master

4 files changed

modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -58,6 +58,8 @@
 RUN git clone $REPO_URL -b $BRANCH .
 RUN cargo build --features=$FEATURE --$PROFILE
 
+RUN ls -la /unique_parachain
+RUN ls -la /unique_parachain/target/release/wbuild
 
 # ===== BUILD POLKADOT =====
 FROM rust-builder as builder-polkadot
@@ -76,6 +78,9 @@
 
 FROM ubuntu:20.04
 
+ARG RUNTIME=
+ENV RUNTIME $RUNTIME
+
 RUN apt-get -y update && \
       apt-get -y install curl git && \
       curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
@@ -92,9 +97,15 @@
     npm install --global yarn && \
     yarn install
 
+RUN echo "$RUNTIME"
+
 COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
 COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
+COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm
+
 COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm
+				      
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
modified.docker/docker-compose.tmp-forkless.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless.j2
+++ b/.docker/docker-compose.tmp-forkless.j2
@@ -8,6 +8,7 @@
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
         - "FEATURE={{ FEATURE }}"
+        - "RUNTIME={{ RUNTIME }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "MAINNET_TAG={{ MAINNET_TAG }}"
         - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
modified.docker/launch-config.j2diffbeforeafterboth
--- a/.docker/launch-config.j2
+++ b/.docker/launch-config.j2
@@ -86,9 +86,9 @@
     },
       "parachains": [
         {
-            "bin": "../unique-chain/current/release/unique-collator",
-            "upgradeBin": "../unique-chain/target/release/unique-collator",
-            "upgradeWasm": "../unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm",
+            "bin": "/unique-chain/current/release/unique-collator",
+            "upgradeBin": "/unique-chain/target/release/unique-collator",
+            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm",
             "id": "1000",
             "balance": "1000000000000000000000000",
             "nodes": [
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
before · .github/workflows/forkless-update-nodata.yml
1name: Forkless Parachain update with no 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      - develop9    types:10      - opened11      - reopened12      - synchronize   #commit(s) pushed to the pull request1314  # Allows you to run this workflow manually from the Actions tab15  workflow_dispatch:1617#Define Workflow variables18env:19  REPO_URL: ${{ github.server_url }}/${{ github.repository }}2021# A workflow run is made up of one or more jobs that can run sequentially or in parallel22jobs:23  build:24    # The type of runner that the job will run on25    runs-on: self-hosted-ci2627    name: Build Container, Spin it Up an test2829    continue-on-error: false         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.3031    strategy:32      matrix:33        include:34        #  - network: "Opal"35        #    features: "--features=opal-runtime"36        #    binary_version:37          - network: "Quartz"   # KUSAMA_MAINNET_BRANCH для quartz-runtime38            features: "quartz-runtime"39            runtime: "quartz"40            mainnet_branch: quartz-v924012-241            mainnet_tag: v92401242          - network: "Unique"   # POLKADOT_MAINNET_BRANCH для unique-runtime43            features: "unique-runtime"44            runtime: "unique"45            mainnet_branch: v92401046            mainnet_tag: v92401047484950    steps:51#      - name: Skip if pull request is in Draft52        # `if: github.event.pull_request.draft == true` should be kept here, at53        # the step level, rather than at the job level. The latter is not54        # recommended because when the PR is moved from "Draft" to "Ready to55        # review" the workflow will immediately be passing (since it was skipped),56        # even though it hasn't actually ran, since it takes a few seconds for57        # the workflow to start. This is also disclosed in:58        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1759        # That scenario would open an opportunity for the check to be bypassed:60        # 1. Get your PR approved61        # 2. Move it to Draft62        # 3. Push whatever commits you want63        # 4. Move it to "Ready for review"; now the workflow is passing (it was64        #    skipped) and "Check reviews" is also passing (it won't be updated65        #    until the workflow is finished)66#        if: github.event.pull_request.draft == true67#        run: exit 16869      - 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.tmp-forkless.j284          output_file: .docker/docker-compose.${{ matrix.network }}.yml85          variables: |86            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git87            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}88            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}89            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}90            MAINNET_TAG=${{ matrix.mainnet_tag }}91            MAINNET_BRANCH=${{ matrix.mainnet_branch }}92            FEATURE=${{ matrix.features }}93            BRANCH=${{ github.head_ref }}9495      - name: Show build configuration96        run: cat .docker/docker-compose.${{ matrix.network }}.yml9798      - name: Generate launch-config.json99        uses: cuchi/jinja2-action@v1.2.0100        with:101          template: .docker/launch-config.j2102          output_file: .docker/launch-config-forkless.json103          variables: |104            FEATURE=${{ matrix.features }}105            RUNTIME=${{ matrix.runtime }}106107      - name: Show launch-config-forkless configuration108        run: cat .docker/launch-config-forkless.json109110      - name: Show files in directory111        run: ls -la112113114      - name: Build the stack115        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build116117118#      - name: Test Report119#        uses: phoenix-actions/test-reporting@v8120#        if: success() || failure()    # run this step even if previous step failed121#        with:122#          name: Tests ${{ matrix.network }}            # Name of the check run which will be created123#          path: tests/mochawesome-report/test-*.json    # Path to test results124#          reporter: mochawesome-json125#          fail-on-error: 'false'126#127#      - name: Read output variables128#        run: |129#          echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"130131#      - name: Stop running containers132#        if: always()                   # run this step always133#        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
after · .github/workflows/forkless-update-nodata.yml
1name: Forkless Parachain update with no 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      - develop9    types:10      - opened11      - reopened12      - synchronize   #commit(s) pushed to the pull request1314  # Allows you to run this workflow manually from the Actions tab15  workflow_dispatch:1617#Define Workflow variables18env:19  REPO_URL: ${{ github.server_url }}/${{ github.repository }}2021# A workflow run is made up of one or more jobs that can run sequentially or in parallel22jobs:23  build:24    # The type of runner that the job will run on25    runs-on: self-hosted-ci2627    name: Build Container, Spin it Up an test2829    continue-on-error: false         #Do not stop testing of matrix runs failed.  As it decided during PR review - it required 50/50& Let's check it with false.3031    strategy:32      matrix:33        include:34        #  - network: "Opal"35        #    features: "--features=opal-runtime"36        #    binary_version:37          - network: "Quartz"   # KUSAMA_MAINNET_BRANCH для quartz-runtime38            features: "quartz-runtime"39            runtime: "quartz"40            mainnet_branch: quartz-v924012-241            mainnet_tag: v92401242          - network: "Unique"   # POLKADOT_MAINNET_BRANCH для unique-runtime43            features: "unique-runtime"44            runtime: "unique"45            mainnet_branch: v92401046            mainnet_tag: v92401047484950    steps:51#      - name: Skip if pull request is in Draft52        # `if: github.event.pull_request.draft == true` should be kept here, at53        # the step level, rather than at the job level. The latter is not54        # recommended because when the PR is moved from "Draft" to "Ready to55        # review" the workflow will immediately be passing (since it was skipped),56        # even though it hasn't actually ran, since it takes a few seconds for57        # the workflow to start. This is also disclosed in:58        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1759        # That scenario would open an opportunity for the check to be bypassed:60        # 1. Get your PR approved61        # 2. Move it to Draft62        # 3. Push whatever commits you want63        # 4. Move it to "Ready for review"; now the workflow is passing (it was64        #    skipped) and "Check reviews" is also passing (it won't be updated65        #    until the workflow is finished)66#        if: github.event.pull_request.draft == true67#        run: exit 16869      - 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.tmp-forkless.j284          output_file: .docker/docker-compose.${{ matrix.network }}.yml85          variables: |86            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git87            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}88            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}89            POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}90            MAINNET_TAG=${{ matrix.mainnet_tag }}91            MAINNET_BRANCH=${{ matrix.mainnet_branch }}92            FEATURE=${{ matrix.features }}93            RUNTIME=${{ matrix.runtime }}94            BRANCH=${{ github.head_ref }}9596      - name: Show build configuration97        run: cat .docker/docker-compose.${{ matrix.network }}.yml9899      - name: Generate launch-config.json100        uses: cuchi/jinja2-action@v1.2.0101        with:102          template: .docker/launch-config.j2103          output_file: .docker/launch-config-forkless.json104          variables: |105            FEATURE=${{ matrix.features }}106            RUNTIME=${{ matrix.runtime }}107108      - name: Show launch-config-forkless configuration109        run: cat .docker/launch-config-forkless.json110111      - name: Show files in directory112        run: ls -la113114115      - name: Build the stack116        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build117118119#      - name: Test Report120#        uses: phoenix-actions/test-reporting@v8121#        if: success() || failure()    # run this step even if previous step failed122#        with:123#          name: Tests ${{ matrix.network }}            # Name of the check run which will be created124#          path: tests/mochawesome-report/test-*.json    # Path to test results125#          reporter: mochawesome-json126#          fail-on-error: 'false'127#128#      - name: Read output variables129#        run: |130#          echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"131132#      - name: Stop running containers133#        if: always()                   # run this step always134#        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down