git.delta.rocks / unique-network / refs/commits / 16828e6c7840

difftreelog

delete unsed vars from CI matrix

Konstantin Astakhov2022-10-28parent: #0dc1cc1.patch.diff
in: master

26 files changed

modified.docker/Dockerfile-chain-devdiffbeforeafterboth
--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -1,15 +1,15 @@
 FROM ubuntu:20.04
 
-ARG RUST_TOOLCHAIN=
-ARG FEATURE=
+ARG RUST_TOOLCHAIN
+ARG NETWORK
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
-ENV FEATURE=$FEATURE
+ENV NETWORK=$NETWORK
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 
-RUN echo "$FEATURE\n" && echo "$RUST_TOOLCHAIN\n"
+RUN echo "$NETWORK\n" && echo "$RUST_TOOLCHAIN\n"
 
 RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake protobuf-compiler
 
@@ -26,6 +26,6 @@
 WORKDIR /dev_chain
 
 RUN cargo build --release
-RUN echo "$FEATURE"
+RUN echo "$NETWORK"
 
-CMD cargo run --release --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
+CMD cargo run --release --features=${NETWORK}-runtime -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
modified.docker/Dockerfile-chain-dev-unitdiffbeforeafterboth
--- a/.docker/Dockerfile-chain-dev-unit
+++ b/.docker/Dockerfile-chain-dev-unit
@@ -10,8 +10,8 @@
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
-ARG RUST_TOOLCHAIN=
-ARG FEATURE=
+ARG RUST_TOOLCHAIN
+ARG NETWORK
 
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install $RUST_TOOLCHAIN && \
modified.docker/Dockerfile-parachaindiffbeforeafterboth
--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -35,14 +35,14 @@
 FROM rust-builder as builder-unique
 
 ARG PROFILE=release
-ARG FEATURE=
-ARG REPO_URL=
-ARG BRANCH=
+ARG NETWORK
+ARG REPO_URL
+ARG BRANCH
 
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $BRANCH . && \
-    cargo build --features=$FEATURE --$PROFILE
+    cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== RUN ======
 
modified.docker/Dockerfile-parachain-node-onlydiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-node-only
+++ b/.docker/Dockerfile-parachain-node-only
@@ -35,31 +35,30 @@
 FROM rust-builder as builder-unique-current
 
 ARG PROFILE=release
-ARG FEATURE=
-ARG MAINNET_BRANCH=
-ARG REPO_URL=
+ARG NETWORK
+ARG MAINNET_BRANCH
 
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
-    cargo build --features=$FEATURE --$PROFILE
+    cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== BUILD target version ======
 FROM rust-builder as builder-unique-target
 
 ARG PROFILE=release
-ARG FEATURE=
+ARG NETWORK
 
 COPY . /unique_parachain
 WORKDIR /unique_parachain
 
-RUN cargo build --features=$FEATURE --$PROFILE
+RUN cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== RUN ======
 
 FROM ubuntu:20.04
 
-ARG RUNTIME
+ARG NETWORK
 ARG POLKADOT_LAUNCH_BRANCH
 
 RUN apt-get -y update && \
@@ -78,11 +77,11 @@
     npm install --global yarn && \
     yarn install
 
-RUN echo "$RUNTIME"
+RUN echo "$NETWORK"
 
 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-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm
 
 COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 COPY --from=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
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -34,33 +34,30 @@
 FROM rust-builder as builder-unique-current
 
 ARG PROFILE=release
-ARG FEATURE=
-ARG MAINNET_BRANCH=
-ARG REPO_URL=
+ARG NETWORK
+ARG MAINNET_BRANCH
+ARG REPO_URL
 
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
-    cargo build --features=$FEATURE --$PROFILE
+    cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== BUILD target version ======
 FROM rust-builder as builder-unique-target
 
 ARG PROFILE=release
-ARG FEATURE=
-ARG BRANCH=
-ARG REPO_URL=
+ARG NETWORK
 
 COPY . /unique_parachain
 WORKDIR /unique_parachain
 
-RUN cargo build --features=$FEATURE --$PROFILE
+RUN cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== RUN ======
-
 FROM ubuntu:20.04
 
-ARG RUNTIME
+ARG NETWORK
 ARG POLKADOT_LAUNCH_BRANCH
 
 RUN apt-get -y update && \
@@ -79,11 +76,11 @@
     npm install --global yarn && \
     yarn install
 
-RUN echo "$RUNTIME"
+RUN echo "$NETWORK"
 
 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-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm
 
 COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 COPY --from=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
modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -34,33 +34,32 @@
 FROM rust-builder as builder-unique-current
 
 ARG PROFILE=release
-ARG FEATURE=
-ARG MAINNET_BRANCH=
-ARG REPO_URL=
+ARG NETWORK
+ARG MAINNET_BRANCH
+ARG REPO_URL
 
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
-    cargo build --features=$FEATURE --$PROFILE
+    cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== BUILD target version ======
 FROM rust-builder as builder-unique-target
 
 ARG PROFILE=release
-ARG FEATURE=
-ARG BRANCH=
-ARG REPO_URL=
+ARG NETWORK
+ARG BRANCH
+ARG REPO_URL
 
 COPY . /unique_parachain
 WORKDIR /unique_parachain
 
-RUN cargo build --features=$FEATURE --$PROFILE
+RUN cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== RUN ======
-
 FROM ubuntu:20.04
 
-ARG RUNTIME
+ARG NETWORK
 ARG REPLICA_FROM
 ENV REPLICA_FROM=${REPLICA_FROM}
 ARG POLKADOT_LAUNCH_BRANCH
@@ -81,12 +80,12 @@
     npm install --global yarn && \
     yarn install
 
-RUN echo "$RUNTIME"
+RUN echo "$NETWORK"
 RUN echo "$REPLICA_FROM"
 
 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-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm
 
 COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/
 
modified.docker/Dockerfile-testnet.j2diffbeforeafterboth
--- a/.docker/Dockerfile-testnet.j2
+++ b/.docker/Dockerfile-testnet.j2
@@ -33,7 +33,7 @@
 
 RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
     cd unique-chain && \
-    cargo build --features={{ FEATURE }} --$PROFILE
+    cargo build --features={{ NETWORK }}-runtime --$PROFILE
 
 # ===== RUN ======
 
modified.docker/Dockerfile-try-runtimediffbeforeafterboth
--- a/.docker/Dockerfile-try-runtime
+++ b/.docker/Dockerfile-try-runtime
@@ -33,17 +33,17 @@
 FROM rust-builder as builder-unique
 
 ARG PROFILE=release
-ARG FEATURE=
+ARG NETWORK
 ARG REPLICA_FROM=
-ENV FEATURE $FEATURE
+ENV NETWORK $NETWORK
 ENV REPLICA_FROM $REPLICA_FROM
 
 COPY . /unique_parachain
 WORKDIR /unique_parachain
 
 
-RUN echo "Requested features: $FEATURE\n" && \
+RUN echo "Requested features: ${NETWORK}-runtime\n" && \
     echo "Fork from: $REPLICA_FROM\n" && \
-    cargo build --features=$FEATURE --release
+    cargo build --features=${NETWORK}-runtime --release
 
-CMD cargo run --features=try-runtime,$FEATURE --release -- try-runtime --no-spec-check-panic on-runtime-upgrade live --uri $REPLICA_FROM
+CMD cargo run --features=try-runtime,${NETWORK}-runtime --release -- try-runtime --no-spec-check-panic on-runtime-upgrade live --uri $REPLICA_FROM
modified.docker/docker-compose.tmp-dev.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-dev.j2
+++ b/.docker/docker-compose.tmp-dev.j2
@@ -5,7 +5,7 @@
     build:
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "FEATURE={{ FEATURE }}"
+        - "NETWORK={{ NETWORK }}"
       context: ../
       dockerfile: .docker/Dockerfile-chain-dev
     expose:
@@ -18,4 +18,4 @@
       options:
         max-size: "1m"
         max-file: "3"
-    command: cargo run --release --features={{ FEATURE }} -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
+    command: cargo run --release --features={{ NETWORK }}-runtime -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
modified.docker/docker-compose.tmp-forkless-data.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless-data.j2
+++ b/.docker/docker-compose.tmp-forkless-data.j2
@@ -7,8 +7,7 @@
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
-        - "FEATURE={{ FEATURE }}"
-        - "RUNTIME={{ RUNTIME }}"
+        - "NETWORK"={{ NETWORK }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"
         - "MAINNET_TAG={{ MAINNET_TAG }}"
modified.docker/docker-compose.tmp-forkless-nodata.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless-nodata.j2
+++ b/.docker/docker-compose.tmp-forkless-nodata.j2
@@ -7,8 +7,7 @@
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
-        - "FEATURE={{ FEATURE }}"
-        - "RUNTIME={{ RUNTIME }}"
+        - "NETWORK"={{ NETWORK }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"        
         - "MAINNET_TAG={{ MAINNET_TAG }}"
modified.docker/docker-compose.tmp-master.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-master.j2
+++ b/.docker/docker-compose.tmp-master.j2
@@ -7,5 +7,5 @@
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
-        - "FEATURE={{ FEATURE }}"
+        - "NETWORK={{ NETWORK }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
modified.docker/docker-compose.tmp-node.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-node.j2
+++ b/.docker/docker-compose.tmp-node.j2
@@ -7,8 +7,7 @@
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
-        - "FEATURE={{ FEATURE }}"
-        - "RUNTIME={{ RUNTIME }}"
+        - "NETWORK"={{ NETWORK }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"        
         - "MAINNET_TAG={{ MAINNET_TAG }}"
modified.docker/docker-compose.tmp-unit.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-unit.j2
+++ b/.docker/docker-compose.tmp-unit.j2
@@ -7,7 +7,7 @@
       dockerfile: .docker/Dockerfile-chain-dev-unit
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "FEATURE={{ FEATURE }}"
+        - "NETWORK={{ NETWORK }}"
     logging:
       options:
         max-size: "1m"
modified.docker/docker-compose.try-runtime.j2diffbeforeafterboth
--- a/.docker/docker-compose.try-runtime.j2
+++ b/.docker/docker-compose.try-runtime.j2
@@ -5,6 +5,6 @@
     build:
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
-        - "FEATURE={{ FEATURE }}"
+        - "NETWORK={{ NETWORK }}"
         - "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
@@ -88,7 +88,7 @@
         {
             "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",
+            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm",
             "id": "1000",
             "balance": "1000000000000000000000000",
             "chainRawInitializer": [
modified.docker/forkless-config/launch-config-forkless-nodata.j2diffbeforeafterboth
--- a/.docker/forkless-config/launch-config-forkless-nodata.j2
+++ b/.docker/forkless-config/launch-config-forkless-nodata.j2
@@ -88,7 +88,7 @@
         {
             "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",
+            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm",
             "id": "1000",
             "balance": "1000000000000000000000000",
             "nodes": [
modified.docker/forkless-config/launch-config-node-update-only-v3.j2diffbeforeafterboth
--- a/.docker/forkless-config/launch-config-node-update-only-v3.j2
+++ b/.docker/forkless-config/launch-config-node-update-only-v3.j2
@@ -88,7 +88,7 @@
         {
             "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",
+            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm",
             "id": "1000",
             "balance": "1000000000000000000000000",
             "nodes": [
modified.github/workflows/forkless-update-data.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -35,9 +35,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_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 }}}
+            network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}, replica_from_address {${{ env.OPAL_REPLICA_FROM }}}
+            network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}, replica_from_address {${{ env.QUARTZ_REPLICA_FROM }}}
+            network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}, replica_from_address {${{ env.UNIQUE_REPLICA_FROM }}}
 
   forkless-update-data:
     needs: execution-marix
@@ -78,8 +78,7 @@
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
             REPLICA_FROM=${{ matrix.replica_from_address }}
 
@@ -92,8 +91,7 @@
           template: .docker/forkless-config/launch-config-forkless-data.j2
           output_file: .docker/launch-config-forkless-data.json
           variables: |
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             REPLICA_FROM=${{ matrix.replica_from_address }}
 
       - name: Show launch-config-forkless configuration
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -34,9 +34,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
-            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
+            network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
+            network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
+            network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
 
 
   forkless-update-nodata:
@@ -79,8 +79,7 @@
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
 
       - name: Show build configuration
@@ -92,8 +91,7 @@
           template: .docker/forkless-config/launch-config-forkless-nodata.j2
           output_file: .docker/launch-config-forkless-nodata.json
           variables: |
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
modified.github/workflows/integration-tests.ymldiffbeforeafterboth
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -35,9 +35,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
-            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
+            network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
+            network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
+            network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
  
   parallel-test:
     needs: nodes-execution-matrix
@@ -82,8 +82,7 @@
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
             
       - name: Show build configuration
@@ -95,8 +94,7 @@
           template: .docker/forkless-config/launch-config-node-update-only-v3.j2
           output_file: .docker/launch-config-forkless-nodata.json
           variables: |
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
@@ -232,8 +230,7 @@
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
             
       - name: Show build configuration
@@ -245,8 +242,7 @@
           template: .docker/forkless-config/launch-config-node-update-only-v3.j2
           output_file: .docker/launch-config-forkless-nodata.json
           variables: |
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
modified.github/workflows/market-test.ymldiffbeforeafterboth
before · .github/workflows/market-test.yml
1# https://cryptousetech.atlassian.net/wiki/spaces/CI/pages/2586509375/Market+e2e+test2# Nested workflow for lunching Market e2e tests from external repository https://github.com/UniqueNetwork/market-e2e-tests34name: market api tests56# Controls when the action will run.7on:8  workflow_call:91011# A workflow run is made up of one or more jobs that can run sequentially or in parallel12jobs:1314  market_test:15    # The type of runner that the job will run on16    runs-on: [self-hosted-ci,large]17    timeout-minutes: 3601819    name: ${{ matrix.network }}    2021    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.22    23    strategy:24      matrix:25        include:26          - network: "opal"27            features: "opal-runtime"2829    steps:30      - name: Clean Workspace31        uses: AutoModality/action-clean@v1.1.03233      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it34      - name: Checkout master repo35        uses: actions/checkout@master36        with:37          ref: ${{ github.head_ref }}  #Checking out head commit3839      - name: Checkout Market e2e tests40        uses: actions/checkout@v341        with:42          repository: 'UniqueNetwork/market-e2e-tests'43          ssh-key: ${{ secrets.GH_PAT }}44          path: 'qa-tests'45          ref: 'master'4647      - name: Read .env file48        uses: xom9ikk/dotenv@v249      50      - name: Copy qa-tests/.env.example to qa-tests/.env51        working-directory: qa-tests52        run: cp .env.docker .env53        54      - name: Generate ENV related extend file for docker-compose55        uses: cuchi/jinja2-action@v1.2.056        with:57          template: qa-tests/.docker/docker-compose.tmp-market.j258          output_file: qa-tests/.docker/docker-compose.${{ matrix.network }}.yml59          variables: |60            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git61            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}62            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}63            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}64            FEATURE=${{ matrix.features }}65            BRANCH=${{ github.head_ref }}666768      - name: Show build configuration69        working-directory: qa-tests70        run: cat .docker/docker-compose.${{ matrix.network }}.yml7172      - name: Start node-parachain73        working-directory: qa-tests74        run: docker-compose -f ".docker/docker-compose.market.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate node-parachain 75     76      - uses: actions/setup-node@v377        with:78          node-version: 16.177980      - name: Setup TypeScript81        working-directory: qa-tests82        run: |83          npm install -g ts-node84          npm install8586      - name: Copy qa-tests/.env.docker to qa-tests/.env87        working-directory: qa-tests88        run: | 89          rm -rf .env90          cp .env.docker .env9192# Temporary disable node readyness check. Have to dig into the script logic.93#      - name: Wait for chain up and running94#        working-directory: tests95#        run: |96#          yarn install97#          node scripts/readyness.js98#          echo "Ready to start tests"99#        env:100#          RPC_URL: http://127.0.0.1:9933/101102      - name: Wait for chain up and running103        run: |104          sleep 1200s105          echo "Ready to start Market e2e tests"106107      - name: Show content of .env file and Generate accounts108        working-directory: qa-tests109        run: |110          cat .env111          ts-node ./src/scripts/create-market-accounts.ts112113      - name: Copy qa-tests/.env to qa-tests/.env.docker114        working-directory: qa-tests115        run: | 116          rm -rf .env.docker117          cp .env .env.docker118119      - name: Get chain logs120        if: always()                   # run this step always121        run: |122          docker exec node-parachain cat /polkadot-launch/9944.log123          docker exec node-parachain cat /polkadot-launch/9945.log124          docker exec node-parachain cat /polkadot-launch/alice.log125          docker exec node-parachain cat /polkadot-launch/eve.log126          docker exec node-parachain cat /polkadot-launch/dave.log127          docker exec node-parachain cat /polkadot-launch/charlie.log128   129      - name: Deploy contracts130        run: |131          cd qa-tests132          ts-node ./src/scripts/deploy-contract.ts133134      - name: Timeout for debug135        if: failure()136        run: sleep 300s137138      - name: Import test data139        working-directory: qa-tests140        run: ts-node ./src/scripts/create-test-collections.ts141142      - name: Show content of qa-test .env143        working-directory: qa-tests144        run: cat .env145146      - name: Read qa -test .env file Before market start147        uses: xom9ikk/dotenv@v2148        with:149          path: qa-tests/150151      - name: local-market:start152        run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" up -d --build153154      - name: Wait for market readyness155        working-directory: qa-tests156        run: src/scripts/wait-market-ready.sh157        shell: bash158159      - name: Install dependecies160        working-directory: qa-tests161        run: |162          npm ci163          npm install -D @playwright/test164          npx playwright install-deps165          npx playwright install166167      - name: Show content of qa-test .env168        working-directory: qa-tests169        run: cat .env170          171      - name: Test API interface172        working-directory: qa-tests173        run: |174          npx playwright test --workers=3 --quiet .*.api.test.ts --reporter=github --config playwright.config.ts175176      - name: Timeout for debug177        if: failure()178        run: sleep 300s179180      - name: Stop running containers181        if: always()                   # run this step always182        run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down --volumes183184      - name: Remove builder cache185        if: always()                   # run this step always186        run: |187          docker builder prune -f188          docker system prune -f
after · .github/workflows/market-test.yml
1# https://cryptousetech.atlassian.net/wiki/spaces/CI/pages/2586509375/Market+e2e+test2# Nested workflow for lunching Market e2e tests from external repository https://github.com/UniqueNetwork/market-e2e-tests34name: market api tests56# Controls when the action will run.7on:8  workflow_call:91011# A workflow run is made up of one or more jobs that can run sequentially or in parallel12jobs:1314  market_test:15    # The type of runner that the job will run on16    runs-on: [self-hosted-ci,large]17    timeout-minutes: 3601819    name: ${{ matrix.network }}    2021    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.22    23    strategy:24      matrix:25        include:26          - network: "opal"2728    steps:29      - name: Clean Workspace30        uses: AutoModality/action-clean@v1.1.03132      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it33      - name: Checkout master repo34        uses: actions/checkout@master35        with:36          ref: ${{ github.head_ref }}  #Checking out head commit3738      - name: Checkout Market e2e tests39        uses: actions/checkout@v340        with:41          repository: 'UniqueNetwork/market-e2e-tests'42          ssh-key: ${{ secrets.GH_PAT }}43          path: 'qa-tests'44          ref: 'master'4546      - name: Read .env file47        uses: xom9ikk/dotenv@v248      49      - name: Copy qa-tests/.env.example to qa-tests/.env50        working-directory: qa-tests51        run: cp .env.docker .env52        53      - name: Generate ENV related extend file for docker-compose54        uses: cuchi/jinja2-action@v1.2.055        with:56          template: qa-tests/.docker/docker-compose.tmp-market.j257          output_file: qa-tests/.docker/docker-compose.${{ matrix.network }}.yml58          variables: |59            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git60            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}61            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}62            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}63            NETWORK=${{ matrix.network }}64            BRANCH=${{ github.head_ref }}656667      - name: Show build configuration68        working-directory: qa-tests69        run: cat .docker/docker-compose.${{ matrix.network }}.yml7071      - name: Start node-parachain72        working-directory: qa-tests73        run: docker-compose -f ".docker/docker-compose.market.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate node-parachain 74     75      - uses: actions/setup-node@v376        with:77          node-version: 16.177879      - name: Setup TypeScript80        working-directory: qa-tests81        run: |82          npm install -g ts-node83          npm install8485      - name: Copy qa-tests/.env.docker to qa-tests/.env86        working-directory: qa-tests87        run: | 88          rm -rf .env89          cp .env.docker .env9091# Temporary disable node readyness check. Have to dig into the script logic.92#      - name: Wait for chain up and running93#        working-directory: tests94#        run: |95#          yarn install96#          node scripts/readyness.js97#          echo "Ready to start tests"98#        env:99#          RPC_URL: http://127.0.0.1:9933/100101      - name: Wait for chain up and running102        run: |103          sleep 1200s104          echo "Ready to start Market e2e tests"105106      - name: Show content of .env file and Generate accounts107        working-directory: qa-tests108        run: |109          cat .env110          ts-node ./src/scripts/create-market-accounts.ts111112      - name: Copy qa-tests/.env to qa-tests/.env.docker113        working-directory: qa-tests114        run: | 115          rm -rf .env.docker116          cp .env .env.docker117118      - name: Get chain logs119        if: always()                   # run this step always120        run: |121          docker exec node-parachain cat /polkadot-launch/9944.log122          docker exec node-parachain cat /polkadot-launch/9945.log123          docker exec node-parachain cat /polkadot-launch/alice.log124          docker exec node-parachain cat /polkadot-launch/eve.log125          docker exec node-parachain cat /polkadot-launch/dave.log126          docker exec node-parachain cat /polkadot-launch/charlie.log127   128      - name: Deploy contracts129        run: |130          cd qa-tests131          ts-node ./src/scripts/deploy-contract.ts132133      - name: Timeout for debug134        if: failure()135        run: sleep 300s136137      - name: Import test data138        working-directory: qa-tests139        run: ts-node ./src/scripts/create-test-collections.ts140141      - name: Show content of qa-test .env142        working-directory: qa-tests143        run: cat .env144145      - name: Read qa -test .env file Before market start146        uses: xom9ikk/dotenv@v2147        with:148          path: qa-tests/149150      - name: local-market:start151        run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" up -d --build152153      - name: Wait for market readyness154        working-directory: qa-tests155        run: src/scripts/wait-market-ready.sh156        shell: bash157158      - name: Install dependecies159        working-directory: qa-tests160        run: |161          npm ci162          npm install -D @playwright/test163          npx playwright install-deps164          npx playwright install165166      - name: Show content of qa-test .env167        working-directory: qa-tests168        run: cat .env169          170      - name: Test API interface171        working-directory: qa-tests172        run: |173          npx playwright test --workers=3 --quiet .*.api.test.ts --reporter=github --config playwright.config.ts174175      - name: Timeout for debug176        if: failure()177        run: sleep 300s178179      - name: Stop running containers180        if: always()                   # run this step always181        run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down --volumes182183      - name: Remove builder cache184        if: always()                   # run this step always185        run: |186          docker builder prune -f187          docker system prune -f
modified.github/workflows/node-only-update.ymldiffbeforeafterboth
--- a/.github/workflows/node-only-update.yml
+++ b/.github/workflows/node-only-update.yml
@@ -37,9 +37,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
-            network {unique}, runtime {unique}, features {unique-runtime}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
+            network {opal}, mainnet_branch {${{ env.OPAL_MAINNET_TAG }}}
+            network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_TAG }}}
+            network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_TAG }}}
 
 
 
@@ -84,8 +84,7 @@
             POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
 
       - name: Show build configuration
@@ -97,8 +96,7 @@
           template: .docker/forkless-config/launch-config-forkless-nodata.j2
           output_file: .docker/launch-config-forkless-nodata.json
           variables: |
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
 
       - name: Show launch-config-forkless configuration
         run: cat .docker/launch-config-forkless-nodata.json
modified.github/workflows/testnet-build.ymldiffbeforeafterboth
--- a/.github/workflows/testnet-build.yml
+++ b/.github/workflows/testnet-build.yml
@@ -40,9 +40,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, runtime {opal}, features {opal-runtime}
-            network {quartz}, runtime {quartz}, features {quartz-runtime}
-            network {unique}, runtime {unique}, features {unique-runtime}
+            network {opal}
+            network {quartz}
+            network {unique}
 
   testnet-build:
     needs: prepare-execution-marix
@@ -85,8 +85,7 @@
             NETWORK=${{ matrix.network }}
             POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
             POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
-            FEATURE=${{ matrix.features }}
-            RUNTIME=${{ matrix.runtime }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
 
       - name: Show build configuration
modified.github/workflows/try-runtime.ymldiffbeforeafterboth
--- a/.github/workflows/try-runtime.yml
+++ b/.github/workflows/try-runtime.yml
@@ -19,13 +19,10 @@
       matrix:
         include:
           - network: opal
-            features: opal-runtime
             replica_from_address: wss://eu-ws-opal.unique.network:443
           - network: quartz
-            features: quartz-runtime
             replica_from_address: wss://eu-ws-quartz.unique.network:443
           - network: unique
-            features: unique-runtime
             replica_from_address: wss://eu-ws.unique.network:443
 
     steps:
@@ -48,7 +45,7 @@
           output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml
           variables: |
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
-            FEATURE=${{ matrix.features }}
+            NETWORK=${{ matrix.network }}
             REPLICA_FROM=${{ matrix.replica_from_address }}
 
       - name: Show build configuration
modified.github/workflows/yarn-dev.ymldiffbeforeafterboth
--- a/.github/workflows/yarn-dev.yml
+++ b/.github/workflows/yarn-dev.yml
@@ -24,11 +24,8 @@
       matrix:
         include:
           - network: "opal"
-            features: "opal-runtime"
           - network: "quartz"
-            features: "quartz-runtime"
           - network: "unique"
-            features: "unique-runtime"
 
     steps:
 
@@ -50,7 +47,7 @@
           output_file: .docker/docker-compose.${{ matrix.network }}.yml
           variables: |
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
-            FEATURE=${{ matrix.features }}
+            NETWORK=${{ matrix.network }}
     
 
       - name: Show build configuration