git.delta.rocks / unique-network / refs/commits / 0908fa415369

difftreelog

Merge pull request #498 from UniqueNetwork/CI-40-int-test-parachain-mode-v1

Yaroslav Bolyukin2022-08-15parents: #d761464 #c2ed355.patch.diff
in: master

4 files changed

modified.docker/Dockerfile-parachaindiffbeforeafterboth
before · .docker/Dockerfile-parachain
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"101112RUN apt-get update && \13    apt-get install -y curl cmake pkg-config libssl-dev git clang && \14    apt-get clean && \15    rm -r /var/lib/apt/lists/*1617RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1819RUN rustup toolchain uninstall $(rustup toolchain list) && \20    rustup toolchain install $RUST_TOOLCHAIN && \21    rustup default $RUST_TOOLCHAIN && \22    rustup target list --installed && \23    rustup show24RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2526RUN mkdir /unique_parachain27WORKDIR /unique_parachain282930# ===== BUILD ======31FROM rust-builder as builder-unique3233ARG PROFILE=release34ARG FEATURE=35ARG REPO_URL=36ARG BRANCH=3738RUN mkdir /unique_parachain39WORKDIR /unique_parachain4041RUN git clone $REPO_URL -b $BRANCH && \42    cargo build --features=$FEATURE --$PROFILE434445# ===== BUILD POLKADOT =====46FROM rust-builder as builder-polkadot4748ARG POLKADOT_BUILD_BRANCH=49ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH5051RUN mkdir /unique_parachain52WORKDIR /unique_parachain5354RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \55    cd polkadot && \56    cargo build --release5758# ===== RUN ======5960FROM ubuntu:20.046162RUN apt-get -y update && \63      apt-get -y install curl git && \64      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \65      export NVM_DIR="$HOME/.nvm" && \66      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \67      nvm install v16.16.0 && \68      nvm use v16.16.06970RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing7172RUN export NVM_DIR="$HOME/.nvm" && \73    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \74    cd /polkadot-launch && \75    npm install --global yarn && \76    yarn install7778COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/79COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/8081COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json828384CMD export NVM_DIR="$HOME/.nvm" && \85    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \86    cd /polkadot-launch && \87    yarn start launch-config.json
after · .docker/Dockerfile-parachain
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"101112RUN apt-get update && \13    apt-get install -y curl cmake pkg-config libssl-dev git clang && \14    apt-get clean && \15    rm -r /var/lib/apt/lists/*1617RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1819RUN rustup toolchain uninstall $(rustup toolchain list) && \20    rustup toolchain install $RUST_TOOLCHAIN && \21    rustup default $RUST_TOOLCHAIN && \22    rustup target list --installed && \23    rustup show24RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2526RUN mkdir /unique_parachain27WORKDIR /unique_parachain282930# ===== BUILD ======31FROM rust-builder as builder-unique3233ARG PROFILE=release34ARG FEATURE=35ARG REPO_URL=36ARG BRANCH=3738RUN mkdir /unique_parachain39WORKDIR /unique_parachain4041RUN git clone $REPO_URL -b $BRANCH && \42    cargo build --features=$FEATURE --$PROFILE4344# ===== BUILD POLKADOT =====45FROM rust-builder as builder-polkadot4647ARG POLKADOT_BUILD_BRANCH=48ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH4950RUN mkdir /unique_parachain51WORKDIR /unique_parachain5253RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \54    cd polkadot && \55    cargo build --release5657# ===== RUN ======5859FROM ubuntu:20.046061RUN apt-get -y update && \62      apt-get -y install curl git && \63      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \64      export NVM_DIR="$HOME/.nvm" && \65      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \66      nvm install v16.16.0 && \67      nvm use v16.16.06869RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing7071RUN export NVM_DIR="$HOME/.nvm" && \72    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \73    cd /polkadot-launch && \74    npm install --global yarn && \75    yarn install7677COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/78COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/7980COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json818283CMD export NVM_DIR="$HOME/.nvm" && \84    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \85    cd /polkadot-launch && \86    yarn start launch-config.json
deleted.docker/docker-compose-master.yamldiffbeforeafterboth
--- a/.docker/docker-compose-master.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "3.5"
-
-services:
-  blockchain_nodes:
-    build:
-      context: ../
-      dockerfile: .docker/Dockerfile-parachain
-    image: blockchain_nodes
-    container_name: blockchain_nodes
-    expose:
-      - 9944
-      - 9933
-    ports:
-      - 127.0.0.1:9944:9944
-      - 127.0.0.1:9933:9933
-    logging:
-      options:
-        max-size: "1m"
-        max-file: "3"
added.docker/docker-compose-master.ymldiffbeforeafterboth
--- /dev/null
+++ b/.docker/docker-compose-master.yml
@@ -0,0 +1,19 @@
+version: "3.5"
+
+services:
+  blockchain_nodes:
+    build:
+      context: ../
+      dockerfile: .docker/Dockerfile-parachain
+    image: blockchain_nodes
+    container_name: blockchain_nodes
+    expose:
+      - 9944
+      - 9933
+    ports:
+      - 127.0.0.1:9944:9944
+      - 127.0.0.1:9933:9933
+    logging:
+      options:
+        max-size: "1m"
+        max-file: "3"
modified.github/workflows/build-test-master.ymldiffbeforeafterboth
--- a/.github/workflows/build-test-master.yml
+++ b/.github/workflows/build-test-master.yml
@@ -21,7 +21,7 @@
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
 
-  build:
+  master-build-and-test:
     # The type of runner that the job will run on
     runs-on: self-hosted-ci
 
@@ -34,11 +34,11 @@
       matrix:
         include:
           - network: "Opal"
-            features: " "
+            features: "opal-runtime"
           - network: "Quartz"
-            features: "--features=quartz-runtime"
+            features: "quartz-runtime"
           - network: "Unique"
-            features: "--features=unique-runtime"
+            features: "unique-runtime"
 
     steps:
       - name: Skip if pull request is in Draft