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
--- a/.github/workflows/market-test.yml
+++ b/.github/workflows/market-test.yml
@@ -24,7 +24,6 @@
       matrix:
         include:
           - network: "opal"
-            features: "opal-runtime"
 
     steps:
       - name: Clean Workspace
@@ -61,7 +60,7 @@
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
             POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
-            FEATURE=${{ matrix.features }}
+            NETWORK=${{ matrix.network }}
             BRANCH=${{ github.head_ref }}
 
 
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
before · .github/workflows/testnet-build.yml
1name: testnet-image-build23# Controls when the action will run.4on:5  workflow_call:6  7  # Allows you to run this workflow manually from the Actions tab8  workflow_dispatch:910#Define Workflow variables11env:12  REPO_URL: ${{ github.server_url }}/${{ github.repository }}1314# A workflow run is made up of one or more jobs that can run sequentially or in parallel15jobs:1617  prepare-execution-marix:1819    name: Prepare execution matrix2021    runs-on: [self-hosted-ci,medium]22    outputs:23      matrix: ${{ steps.create_matrix.outputs.matrix }}2425    steps:2627      - name: Clean Workspace28        uses: AutoModality/action-clean@v1.1.02930      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it31      - uses: actions/checkout@v332        with:33          ref: ${{ github.head_ref }}  #Checking out head commit3435      - name: Read .env file36        uses: xom9ikk/dotenv@v23738      - name: Create Execution matrix39        uses: fabiocaccamo/create-matrix-action@v240        id: create_matrix41        with:42          matrix: |43            network {opal}, runtime {opal}, features {opal-runtime}44            network {quartz}, runtime {quartz}, features {quartz-runtime}45            network {unique}, runtime {unique}, features {unique-runtime}4647  testnet-build:48    needs: prepare-execution-marix49    # The type of runner that the job will run on50    runs-on: [self-hosted-ci,medium]5152    timeout-minutes: 6005354    name: ${{ matrix.network }}5556    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.5758    strategy:59      matrix:60        include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}6162    steps:63      - name: Skip if pull request is in Draft64        if: github.event.pull_request.draft == true65        run: exit 16667      - name: Clean Workspace68        uses: AutoModality/action-clean@v1.1.06970      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it71      - uses: actions/checkout@v372        with:73          ref: ${{ github.head_ref }}  #Checking out head commit7475      - name: Read .env file76        uses: xom9ikk/dotenv@v27778      - name: Generate ENV related extend file for docker-compose79        uses: cuchi/jinja2-action@v1.2.080        with:81          template: .docker/Dockerfile-testnet.j282          output_file: .docker/Dockerfile-testnet.${{ matrix.network }}.yml83          variables: |84            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}85            NETWORK=${{ matrix.network }}86            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}87            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}88            FEATURE=${{ matrix.features }}89            RUNTIME=${{ matrix.runtime }}90            BRANCH=${{ github.head_ref }}9192      - name: Show build configuration93        run: cat .docker/Dockerfile-testnet.${{ matrix.network }}.yml9495      - name: Show launch-config configuration96        run: cat launch-config.json9798      - name: Run find-and-replace to remove slashes from branch name99        uses: mad9000/actions-find-and-replace-string@2100        id: branchname101        with:102          source: ${{ github.head_ref }}103          find: '/'104          replace: '-'105106      - name: Log in to Docker Hub107        uses: docker/login-action@v2.0.0108        with:109          username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}110          password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}111112      - name: Pull polkadot docker image113        run: docker pull uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }}           114115      - name: Build the stack116        run: cd .docker/ && docker build --file ./Dockerfile-testnet.${{ matrix.network }}.yml --tag uniquenetwork/${{ matrix.network }}-testnet-local-nightly:nightly-${{ steps.branchname.outputs.value }}-${{ github.sha }} . 117118      - name: Push docker version image119        run: docker push uniquenetwork/${{ matrix.network }}-testnet-local-nightly:nightly-${{ steps.branchname.outputs.value }}-${{ github.sha }}120121      - name: Clean Workspace122        if: always()123        uses: AutoModality/action-clean@v1.1.0124125      - name: Remove builder cache126        if: always()                   # run this step always127        run: |128          docker builder prune -f129          docker system prune -f
after · .github/workflows/testnet-build.yml
1name: testnet-image-build23# Controls when the action will run.4on:5  workflow_call:6  7  # Allows you to run this workflow manually from the Actions tab8  workflow_dispatch:910#Define Workflow variables11env:12  REPO_URL: ${{ github.server_url }}/${{ github.repository }}1314# A workflow run is made up of one or more jobs that can run sequentially or in parallel15jobs:1617  prepare-execution-marix:1819    name: Prepare execution matrix2021    runs-on: [self-hosted-ci,medium]22    outputs:23      matrix: ${{ steps.create_matrix.outputs.matrix }}2425    steps:2627      - name: Clean Workspace28        uses: AutoModality/action-clean@v1.1.02930      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it31      - uses: actions/checkout@v332        with:33          ref: ${{ github.head_ref }}  #Checking out head commit3435      - name: Read .env file36        uses: xom9ikk/dotenv@v23738      - name: Create Execution matrix39        uses: fabiocaccamo/create-matrix-action@v240        id: create_matrix41        with:42          matrix: |43            network {opal}44            network {quartz}45            network {unique}4647  testnet-build:48    needs: prepare-execution-marix49    # The type of runner that the job will run on50    runs-on: [self-hosted-ci,medium]5152    timeout-minutes: 6005354    name: ${{ matrix.network }}5556    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.5758    strategy:59      matrix:60        include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}6162    steps:63      - name: Skip if pull request is in Draft64        if: github.event.pull_request.draft == true65        run: exit 16667      - name: Clean Workspace68        uses: AutoModality/action-clean@v1.1.06970      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it71      - uses: actions/checkout@v372        with:73          ref: ${{ github.head_ref }}  #Checking out head commit7475      - name: Read .env file76        uses: xom9ikk/dotenv@v27778      - name: Generate ENV related extend file for docker-compose79        uses: cuchi/jinja2-action@v1.2.080        with:81          template: .docker/Dockerfile-testnet.j282          output_file: .docker/Dockerfile-testnet.${{ matrix.network }}.yml83          variables: |84            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}85            NETWORK=${{ matrix.network }}86            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}87            POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}88            NETWORK=${{ matrix.network }}89            BRANCH=${{ github.head_ref }}9091      - name: Show build configuration92        run: cat .docker/Dockerfile-testnet.${{ matrix.network }}.yml9394      - name: Show launch-config configuration95        run: cat launch-config.json9697      - name: Run find-and-replace to remove slashes from branch name98        uses: mad9000/actions-find-and-replace-string@299        id: branchname100        with:101          source: ${{ github.head_ref }}102          find: '/'103          replace: '-'104105      - name: Log in to Docker Hub106        uses: docker/login-action@v2.0.0107        with:108          username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}109          password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}110111      - name: Pull polkadot docker image112        run: docker pull uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }}           113114      - name: Build the stack115        run: cd .docker/ && docker build --file ./Dockerfile-testnet.${{ matrix.network }}.yml --tag uniquenetwork/${{ matrix.network }}-testnet-local-nightly:nightly-${{ steps.branchname.outputs.value }}-${{ github.sha }} . 116117      - name: Push docker version image118        run: docker push uniquenetwork/${{ matrix.network }}-testnet-local-nightly:nightly-${{ steps.branchname.outputs.value }}-${{ github.sha }}119120      - name: Clean Workspace121        if: always()122        uses: AutoModality/action-clean@v1.1.0123124      - name: Remove builder cache125        if: always()                   # run this step always126        run: |127          docker builder prune -f128          docker system prune -f
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