git.delta.rocks / unique-network / refs/commits / 88e36460f932

difftreelog

fix rename variable

Alexander Aksenov2022-08-22parent: #93a0bf6.patch.diff
in: master

9 files changed

modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -108,9 +108,9 @@
 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
 
-ARG FORK_FROM=
-ENV FORK_FROM=$FORK_FROM
-CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" FORK_FROM && \
+ARG REPLICA_FROM=
+ENV REPLICA_FROM=$REPLICA_FROM
+CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
     yarn start launch-config.json --test-upgrade-parachains
modified.docker/Dockerfile-try-runtimediffbeforeafterboth
--- a/.docker/Dockerfile-try-runtime
+++ b/.docker/Dockerfile-try-runtime
@@ -34,17 +34,17 @@
 
 ARG PROFILE=release
 ARG FEATURE=
-ARG FORK_FROM=
+ARG REPLICA_FROM=
 ENV FEATURE $FEATURE
-ENV FORK_FROM $FORK_FROM
+ENV REPLICA_FROM $REPLICA_FROM
 
 COPY . /unique_parachain
 WORKDIR /unique_parachain
 
 
 RUN echo "Requested features: $FEATURE\n" && \
-    echo "Fork from: $FORK_FROM\n" && \
+    echo "Fork from: $REPLICA_FROM\n" && \
     cargo build --features=$FEATURE --release
     
 
-CMD cargo run --features=$FEATURE --release -- try-runtime on-runtime-upgrade live --uri $FORK_FROM
+CMD cargo run --features=$FEATURE --release -- try-runtime on-runtime-upgrade live --uri $REPLICA_FROM
modified.docker/docker-compose.tmp-forkless-data.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless-data.j2
+++ b/.docker/docker-compose.tmp-forkless-data.j2
@@ -12,7 +12,7 @@
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "MAINNET_TAG={{ MAINNET_TAG }}"
         - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
-        - "FORK_FROM={{ FORK_FROM }}"
+        - "REPLICA_FROM={{ REPLICA_FROM }}"
       context: ../
       dockerfile: .docker/Dockerfile-parachain-upgrade-data
     image: node-parachain
modified.docker/docker-compose.try-runtime.j2diffbeforeafterboth
--- a/.docker/docker-compose.try-runtime.j2
+++ b/.docker/docker-compose.try-runtime.j2
@@ -6,5 +6,5 @@
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "FEATURE={{ FEATURE }}"
-        - "FORK_FROM={{ FORK_FROM }}"
+        - "REPLICA_FROM={{ REPLICA_FROM }}"
 
modified.docker/forkless-config/launch-config-forkless-data.j2diffbeforeafterboth
--- a/.docker/forkless-config/launch-config-forkless-data.j2
+++ b/.docker/forkless-config/launch-config-forkless-data.j2
@@ -93,9 +93,9 @@
             "balance": "1000000000000000000000000",
             "chainRawInitializer": [
                 "chainql",
-                "--ext-str=FORK_FROM",
+                "--ext-str=REPLICA_FROM",
                 "--tla-code=rawSpec=import '${rawSpec}'",
-                "--tla-code=forkFrom=std.extVar('FORK_FROM')",
+                "--tla-code=forkFrom=std.extVar('REPLICA_FROM')",
                 "fork.jsonnet"
             ],
             "nodes": [
modified.envdiffbeforeafterboth
--- a/.env
+++ b/.env
@@ -7,6 +7,6 @@
 KUSAMA_MAINNET_BRANCH=release-v0.9.26
 QUARTZ_MAINNET_TAG=quartz-v924012-2
 
-OPAL_FORK_FROM=wss://eu-ws-opal.unique.network:443
-QUARTZ_FORK_FROM=wss://eu-ws-quartz.unique.network:443
-UNIQUE_FORK_FROM=wss://eu-ws.unique.network:443
+OPAL_REPLICA_FROM=wss://eu-ws-opal.unique.network:443
+QUARTZ_REPLICA_FROM=wss://eu-ws-quartz.unique.network:443
+UNIQUE_REPLICA_FROM=wss://eu-ws.unique.network:443
modified.github/workflows/codestyle.ymldiffbeforeafterboth
--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@ -37,16 +37,20 @@
         if: github.event.pull_request.draft == true
         run: exit 1
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:
             toolchain: nightly
             default: true
             target: wasm32-unknown-unknown
-            components: rustfmt, clippy
+            components: rustfmt, clippy 
       - name: Run cargo fmt
-        run: cargo fmt -- --check
+        run: cargo fmt -- --check   # In that mode it returns only exit code.
+      - name: Cargo fmt state
+        if: success()
+        run: echo "Nothing to do. Cargo fmt returned exit code 0."
+
 
   clippy:
     if: ${{ false }}
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -52,9 +52,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {${{ env.OPAL_FORK_FROM }}}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, fork_from_address {${{ env.QUARTZ_FORK_FROM }}}
-            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, fork_from_address {${{ env.UNIQUE_FORK_FROM }}}
+            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}
+            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}
+            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}}
 
 
 
@@ -120,7 +120,7 @@
             FEATURE=${{ matrix.features }}
             RUNTIME=${{ matrix.runtime }}
             BRANCH=${{ github.head_ref }}
-            FORK_FROM=${{ matrix.fork_from_address }}
+            REPLICA_FROM=${{ matrix.replica_from_address }}
 
       - name: Show build configuration
         run: cat .docker/docker-compose.${{ matrix.network }}.yml
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 }}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 --build  --force-recreate --timeout 300 --remove-orphans --exit-code-from try-runtime95 96      - name: Collect Docker Logs97        if: success() || failure()98        uses: jwalton/gh-docker-logs@v2.2.099        with:100          dest: './try-runtime-logs.${{ matrix.network }}'101          images: 'try-runtime' 102103      - name: Show docker logs104        run: cat './try-runtime-logs.${{ matrix.network }}/try-runtime.log'105106      - name: Stop running containers107        if: always()                   # run this step always108        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            replica_from_address: wss://eu-ws-opal.unique.network:44342          - network: quartz43            features: try-runtime,quartz-runtime44            replica_from_address: wss://eu-ws-quartz.unique.network:44345          - network: unique46            features: try-runtime,unique-runtime47            replica_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            REPLICA_FROM=${{ matrix.replica_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 --build  --force-recreate --timeout 300 --remove-orphans --exit-code-from try-runtime95 96      - name: Collect Docker Logs97        if: success() || failure()98        uses: jwalton/gh-docker-logs@v2.2.099        with:100          dest: './try-runtime-logs.${{ matrix.network }}'101          images: 'try-runtime' 102103      - name: Show docker logs104        run: cat './try-runtime-logs.${{ matrix.network }}/try-runtime.log'105106      - name: Stop running containers107        if: always()                   # run this step always108        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" down