git.delta.rocks / unique-network / refs/commits / 405963f1d11c

--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -11,7 +11,7 @@
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update && \
-    apt-get install -y cmake curl pkg-config libssl-dev git clang && \
+    apt-get install -y curl cmake pkg-config libssl-dev git clang && \
     apt-get clean && \
     rm -r /var/lib/apt/lists/*
 
@@ -40,9 +40,8 @@
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
-RUN echo "$MAINNET_BRANCH" && echo "$REPO_URL"
 RUN git clone $REPO_URL -b $MAINNET_BRANCH .
-RUN cargo build $FEATURE --$PROFILE
+RUN cargo build --features=$FEATURE --$PROFILE
 
 
 # ===== BUILD target version ======
@@ -57,10 +56,8 @@
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $BRANCH .
-RUN cargo build $FEATURE --$PROFILE
+RUN cargo build --features=$FEATURE --$PROFILE
 
-COPY /unique_parachain/launch-config-forkless.json /polkadot-launch/launch-config.json
-
 
 # ===== BUILD POLKADOT =====
 FROM rust-builder as builder-polkadot
@@ -98,11 +95,8 @@
 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-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-
-COPY --from=builder-unique-target /unique_parachain/launch-config-forkless.json /polkadot-launch/launch-config.json
 
-
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
-    yarn start launch-config.json --test-upgrade
+    yarn start launch-config.json

7      dockerfile: .docker/Dockerfile-parachain-upgrade7      dockerfile: .docker/Dockerfile-parachain-upgrade
8    image: node-parachain8    image: node-parachain
9    container_name: node-parachain9    container_name: node-parachain
10    volumes:
11      - .docker/launch-config-forkless.json:/polkadot-launch/launch-config.json
10    expose:12    expose:
11      - 994413      - 9944
12      - 993314      - 9933

--- a/.env
+++ b/.env
@@ -1,6 +1,8 @@
 RUST_TOOLCHAIN=nightly-2022-05-11
-RUST_C=1.62.0-nightly
-POLKA_VERSION=release-v0.9.24
-UNIQUE_BRANCH=develop
-USER=***
-PASS=***
+POLKADOT_BUILD_BRANCH=release-v0.9.24
+
+POLKADOT_MAINNET_BRANCH=release-v0.9.25
+UNIQUE_MAINNET_TAG=v924010
+
+KUSAMA_MAINNET_BRANCH=release-v0.9.26
+QUARTZ_MAINNET_TAG=v924012
\ No newline at end of file

--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -16,13 +16,7 @@
 
 #Define Workflow variables
 env:
-  RUST_TOOLCHAIN: nightly-2022-05-11
   REPO_URL: ${{ github.server_url }}/${{ github.repository }}
-  POLKADOT_BUILD_BRANCH: release-v0.9.24
-  POLKADOT_MAINNET_BRANCH: release-v0.9.25  # for unique-runtime
-  UNIQUE_MAINNET_TAG: v924010
-  KUSAMA_MAINNET_BRANCH: release-v0.9.26    # for для quartz-runtime
-  QUARTZ_MAINNET_TAG: v924012
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -41,11 +35,13 @@
         #    features: "--features=opal-runtime"
         #    binary_version:
           - network: "Quartz"   # KUSAMA_MAINNET_BRANCH для quartz-runtime
-            features: "--features=quartz-runtime"
+            features: "quartz-runtime"
+            runtime: "quartz"
             mainnet_branch: quartz-v924012-2
             mainnet_tag: v924012
           - network: "Unique"   # POLKADOT_MAINNET_BRANCH для unique-runtime
-            features: "--features=unique-runtime"
+            features: "unique-runtime"
+            runtime: "unique"
             mainnet_branch: v924010
             mainnet_tag: v924010
 
@@ -70,11 +66,17 @@
 #        if: github.event.pull_request.draft == true
 #        run: exit 1
 
+      - name: Clean Workspace
+        uses: AutoModality/action-clean@v1.1.0
+
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}  #Checking out head commit
 
+      - name: Read .env file
+        uses: xom9ikk/dotenv@v1.0.2
+
       - name: Generate ENV related extend file for docker-compose
         uses: cuchi/jinja2-action@v1.2.0
         with:
@@ -93,8 +95,24 @@
       - name: Show build configuration
         run: cat .docker/docker-compose.${{ matrix.network }}.yml
 
+      - name: Generate launch-config.json
+        uses: cuchi/jinja2-action@v1.2.0
+        with:
+          template: .docker/launch-config.j2
+          output_file: .docker/launch-config-forkless.json
+          variables: |
+            FEATURE=${{ matrix.features }}
+            RUNTIME=${{ matrix.runtime }}
+
+      - name: Show launch-config-forkless configuration
+        run: cat .docker/launch-config-forkless.json
+
+      - name: Show files in directory
+        run: ls -la
+
+
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build
+        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --force-recreate --remove-orphans
 
 
 #      - name: Test Report
@@ -110,6 +128,6 @@
 #        run: |
 #          echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"
 
-      - name: Stop running containers
-        if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
+#      - name: Stop running containers
+#        if: always()                   # run this step always
+#        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down