difftreelog
Removed un-needed artefacts. Added additional build ARGS.
in: master
13 files changed
.docker/Dockerfile-chain-devdiffbeforeafterboth--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -10,9 +10,10 @@
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-ARG RUST_TOOLCHAIN=nightly-2022-04-07
-ARG BRANCH=develop
-ARG REPO_URL=https://github.com/UniqueNetwork/unique-chain.git
+ARG RUST_TOOLCHAIN=nightly-2022-05-11
+ARG POLKA_VERSION=release-v0.9.24
+ARG BRANCH=
+ARG REPO_URL=
ARG FEATURE=
RUN rustup toolchain uninstall $(rustup toolchain list) && \
@@ -24,12 +25,5 @@
WORKDIR /dev_chain
RUN cargo build --release
-
-EXPOSE 9844
-EXPOSE 9944
-EXPOSE 9933
-EXPOSE 9833
-EXPOSE 40333
-EXPOSE 30333
CMD cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
.docker/Dockerfile-parachaindiffbeforeafterboth--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -1,27 +1,10 @@
# ===== Rust builder =====
-FROM phusion/baseimage:focal-1.1.0 as rust-builder
+FROM ubuntu:20.04 as rust-builder
LABEL maintainer="Unique.Network"
ARG RUST_TOOLCHAIN=nightly-2022-05-11
-#ARG RUST_C=1.62.0-nightly
-ARG POLKA_VERSION=release-v0.9.24
-ARG UNIQUE_BRANCH=develop
-
-#ARG USER=***
-#ARG PASS=***
-
ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
-#ENV RUST_C $RUST_C
-ENV POLKA_VERSION $POLKA_VERSION
-ENV UNIQUE_BRANCH $UNIQUE_BRANCH
-
-
-#RUN echo $RUST_TOOLCHAIN
-#RUN echo $RUST_C
-#RUN echo $POLKA_VERSION
-#RUN echo $UNIQUE_BRANCH
-
ENV CARGO_HOME="/cargo-home"
ENV PATH="/cargo-home/bin:$PATH"
@@ -38,46 +21,41 @@
rustup show
RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
-RUN cargo install cargo-chef
+RUN pwd && ls -la
RUN mkdir unique_parachain
WORKDIR /unique_parachain
-# ===== Chef =====
-FROM rust-builder as chef
-
-COPY . .
-RUN cargo chef prepare --recipe-path recipe.json
-
# ===== BUILD ======
FROM rust-builder as builder
+ARG PROFILE=release
+
RUN mkdir unique_parachain
WORKDIR /unique_parachain
-COPY --from=chef /unique_parachain/recipe.json recipe.json
-ARG PROFILE=release
-RUN cargo chef cook "--$PROFILE" --recipe-path recipe.json
-
+RUN pwd && ls -la
COPY . .
-RUN cargo build "--$PROFILE"
+RUN cargo build --$PROFILE
# && \
# cargo test
# ===== BUILD POLKADOT =====
FROM rust-builder as builder-polkadot
+ARG POLKA_VERSION=release-v0.9.24
+ENV POLKA_VERSION $POLKA_VERSION
+
RUN mkdir unique_parachain
WORKDIR /unique_parachain
RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
cd polkadot && \
- git tag -n && \
- cargo build --release
+ cargo build --release
# ===== RUN ======
-FROM phusion/baseimage:focal-1.1.0
+FROM ubuntu:20.04
ARG PROFILE=release
@@ -87,26 +65,19 @@
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- nvm install v15.5.0 && \
- nvm use v15.5.0
+ nvm install v16.16.0 && \
+ nvm use v16.16.0
-RUN git clone https://github.com/paritytech/polkadot-launch
+RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/parachain-forking
RUN export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
cd /polkadot-launch && \
npm install --global yarn && \
- yarn
+ yarn install
COPY --from=builder /unique_parachain/target/$PROFILE/unique-collator /unique-chain/target/$PROFILE/
COPY --from=builder-polkadot /unique_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/
-
-EXPOSE 9844
-EXPOSE 9944
-EXPOSE 9933
-EXPOSE 9833
-EXPOSE 40333
-EXPOSE 30333
CMD export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
.docker/Dockerfile-parachain-v2diffbeforeafterboth--- a/.docker/Dockerfile-parachain-v2
+++ /dev/null
@@ -1,96 +0,0 @@
-# ===== Rust builder =====
-FROM phusion/baseimage:focal-1.1.0 as rust-builder
-LABEL maintainer="Unique.Network"
-
-ARG RUST_TOOLCHAIN={{ actual_toolchain }}
-ARG POLKA_VERSION=release-v0.9.24
-
-
-ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
-ENV POLKA_VERSION $POLKA_VERSION
-
-ENV CARGO_HOME="/cargo-home"
-ENV PATH="/cargo-home/bin:$PATH"
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
-RUN apt-get update && \
- apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
- apt-get install -y cmake pkg-config libssl-dev git clang
-
-RUN rustup toolchain uninstall $(rustup toolchain list) && \
- rustup toolchain install $RUST_TOOLCHAIN && \
- rustup default $RUST_TOOLCHAIN && \
- rustup target list --installed && \
- rustup show
-RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
-
-####works inside repo folder###
-
-
-# ===== BUILD ======
-FROM rust-builder as builder-unique
-
-RUN mkdir unique_parachain
-WORKDIR /unique_parachain
-
-ARG PROFILE='features=quartz-runtime --release'
-
-COPY . .
-RUN cargo build --features=quartz-runtime --release
- # && \
- # cargo test
-
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-RUN mkdir unique_parachain
-WORKDIR /unique_parachain
-
-RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
- cd polkadot && \
- git tag -n && \
- cargo build --release
-
-# ===== RUN ======
-
-FROM phusion/baseimage:focal-1.1.0
-
-#ARG PROFILE='--features=quartz-runtime --release'
-
-RUN apt-get -y update && \
- apt-get -y upgrade && \
- apt-get -y install curl git && \
- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
- export NVM_DIR="$HOME/.nvm" && \
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- nvm install v15.5.0 && \
- nvm use v15.5.0
-
-RUN git clone https://github.com/UniqueNetwork/polkadot-launch.git && \
- cd ./polkadot-launch && \
- git checkout feature/runtime-upgrade-testing
-
-RUN export NVM_DIR="$HOME/.nvm" && \
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- cd /polkadot-launch && \
- npm install --global yarn && \
- yarn
-
-COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
-COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-
-COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]
-
-
-EXPOSE 9844
-EXPOSE 9944
-EXPOSE 9933
-EXPOSE 9833
-EXPOSE 40333
-EXPOSE 30333
-
-CMD export NVM_DIR="$HOME/.nvm" && \
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- cd /polkadot-launch && \
- yarn start launch-config.json
.docker/docker-compose-dev.yamldiffbeforeafterboth--- a/.docker/docker-compose-dev.yaml
+++ b/.docker/docker-compose-dev.yaml
@@ -1,12 +1,12 @@
version: "3.5"
services:
- node-o:
+ node-dev:
build:
context: .
dockerfile: Dockerfile-chain-dev
- image: node-o
- container_name: node-o
+ image: node-dev
+ container_name: node-dev
expose:
- 9944
- 9933
.docker/docker-compose-tests-parachain.ymldiffbeforeafterboth--- a/.docker/docker-compose-tests-parachain.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-version: "3.5"
-
-services:
- blockchain_nodes:
- build:
- context: ./
- dockerfile: Dockerfile-parachain
- args:
- - RUST_TOOLCHAIN=${RUST_TOOLCHAIN:?err}
- - RUST_C=${RUST_C:?err}
- - POLKA_VERSION=${POLKA_VERSION:?err}
- - UNIQUE_BRANCH=${UNIQUE_BRANCH:?err}
- volumes:
- - ./launch-config.json:/polkadot-launch/launch-config.json
- env_file:
- - ./.env
-
- integration_tests:
- build:
- context: tests/
- dockerfile: Dockerfile-tests
- environment:
- RPC_URL: http://blockchain_nodes:9933/
- volumes:
- - ./tests/src/config_docker.ts:/unique_parachain/src/config.ts
- - /home/ubuntu/mochawesome-report:/unique_parachain/mochawesome-report
- depends_on:
- - blockchain_nodes
.docker/docker-compose.tmp.j2diffbeforeafterboth--- a/.docker/docker-compose.tmp.j2
+++ b/.docker/docker-compose.tmp.j2
@@ -1,13 +1,13 @@
version: "3.5"
services:
- node-o:
+ node-dev:
build:
args:
- - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
- - "BRANCH={{ BRANCH }}"
- - "REPO_URL={{ REPO_URL }}"
- - "FEATURE={{ FEATURE }}"
+ - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN:?err }}"
+ - "BRANCH={{ BRANCH:?err }}"
+ - "REPO_URL={{ REPO_URL:?err }}"
+ - "FEATURE={{ FEATURE:?err }}"
+ - "POLKA_VERSION={{ POLKA_VERSION:?err }}"
command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
-
.dockerignorediffbeforeafterboth--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,6 @@
.git/
.github/
+.docker/
doc/
target/
tests/
.github/workflows/codestyle.ymldiffbeforeafterboth--- a/.github/workflows/codestyle.yml
+++ b/.github/workflows/codestyle.yml
@@ -6,7 +6,8 @@
- develop
types:
- opened
- - edited
+ - reopened
+ - synchronize
jobs:
rustfmt:
@@ -29,7 +30,7 @@
runs-on: self-hosted-ci
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v3
- name: Install substrate dependencies
run: sudo apt-get install libssl-dev pkg-config libclang-dev clang
- name: Install latest nightly
.github/workflows/node_build_test.ymldiffbeforeafterboth1name: Build & test1name: Develop - Build & test223# Controls when the action will run.3# Controls when the action will run.4on:4on:5 # Triggers the workflow on push or pull request events but only for the master branch5 # Triggers the workflow on push or pull request events but only for the master branch6 #push:7 # branches: [ develop ]8 pull_request:6 pull_request:9 branches:7 branches:10 - develop8 - develop11 types:9 types:12 - opened10 - opened13 - edited11 - reopened14 - reopened12 - synchronize #commit(s) pushed to the pull request15 # pull_request:1316 # branches: [ develop ]17 # Allows you to run this workflow manually from the Actions tab14 # Allows you to run this workflow manually from the Actions tab18 workflow_dispatch:15 workflow_dispatch:191620#Define Workflow variables17#Define Workflow variables21env:18env:22 ubuntu_version: focal23 chains_release_dir: /opt/runner/chains_release24 opal_chain_workdir: ./src_opal_chain25 quartz_chain_workdir: ./src_quartz_chain26 unique_chain_workdir: ./src_unique_chain27 RUST_TOOLCHAIN: nightly-2022-05-1119 RUST_TOOLCHAIN: nightly-2022-05-1128 REPO_URL: ${{ github.server_url }}/${{ github.repository }}20 REPO_URL: ${{ github.server_url }}/${{ github.repository }}21 POLKA_VERSION: release-v0.9.24292230# A workflow run is made up of one or more jobs that can run sequentially or in parallel23# A workflow run is made up of one or more jobs that can run sequentially or in parallel31jobs:24jobs:32 pre-requisites:33 # The type of runner that the job will run on34 runs-on: self-hosted-ci3536 steps:37 #runs ssh connection38 - name: Install dependencies39 run: |40 sudo apt-get install git curl libssl-dev llvm pkg-config libclang-dev clang make cmake41 sudo apt autoremove42 curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none43 . $HOME/.cargo/env && cargo install --locked --git https://github.com/chevdor/subwasm44 rustup toolchain install ${{ env.RUST_TOOLCHAIN }}45 rustup default ${{ env.RUST_TOOLCHAIN }}46 rustup target add wasm32-unknown-unknown --toolchain ${{ env.RUST_TOOLCHAIN }}474849 build:25 build:53 needs: pre-requisites29 needs: pre-requisites54 name: Build Container, Spin it Up an test30 name: Build Container, Spin it Up an test553156 continue-on-error: true #Do not stop testing of matrix runs failed.32 continue-on-error: false #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.573358 strategy:34 strategy:59 matrix:35 matrix:60 include:36 include:61 - network: "Opal"37 - network: "Opal"62 features: " "38 features: "--features=opal-runtime"63 - network: "Quartz"39 - network: "Quartz"64 features: "--features=quartz-runtime"40 features: "--features=quartz-runtime"65 - network: "Unique"41 - network: "Unique"68 steps:44 steps:69 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it45 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it70 - uses: actions/checkout@v346 - uses: actions/checkout@v347 with:48 ref: ${{ github.event.pull_request.head.sha }} #Checking out head commit714972 - name: Generate ENV related extend file for docker-compose50 - name: Generate ENV related extend file for docker-compose73 uses: cuchi/jinja2-action@v1.2.051 uses: cuchi/jinja2-action@v1.2.074 with:52 with:75 template: .docker/docker-compose.tmp.j253 template: .docker/docker-compose.tmp.j276 output_file: .docker/docker-compose.${{ matrix.network }}.yml54 output_file: .docker/docker-compose.${{ matrix.network }}.yml77 variables: |55 variables: |78 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git56 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git79 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}57 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}80 FEATURE=${{ matrix.features }}58 POLKA_VERSION=${{ env.POLKA_VERSION }}59 FEATURE=${{ matrix.features }}81 BRANCH=${{ github.head_ref }}60 BRANCH=${{ github.head_ref }}826183 - name: Show temporary file62 - name: Show build configuration84 run: cat .docker/docker-compose.${{ matrix.network }}.yml63 run: cat .docker/docker-compose.${{ matrix.network }}.yml856486 - name: Build the stack65 - name: Build the stack87 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build66 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build8889# - name: "Build the Docker image with Feature: ${{ env.features }}"90# run: docker build -t build-${{ github.head_ref }} --file .docker/Dockerfile-chain-dev --build-arg REPO_URL=${{ github.server_url }}/${{ github.repository }}.git --build-arg RUST_TOOLCHAIN=${{ env.actual_toolchain }} --build-arg FEATURE="${{ env.features }}" --build-arg BRANCH=${{ github.head_ref }} --no-cache .916792 - name: Wait68 - name: Wait93 run: sleep 420s69 run: sleep 420s947095 - name: Install node71 - name: Install node96 uses: actions/setup-node@v172 uses: actions/setup-node@v197 with:73 with:98 node-version: 14.x74 node-version: 16.x9975100 - name: Install dependencies76 - name: Install dependencies101 run: |77 run: |.github/workflows/notify.ymldiffbeforeafterboth--- a/.github/workflows/notify.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: telegram message
-on:
- pull_request:
- branches:
- - develop
- types:
- - opened
- - edited
-jobs:
- build:
- runs-on: self-hosted-ci
- steps:
- - uses: avkviring/telegram-github-action@v0.0.13
- env:
- telegram_to: ${{ secrets.TELEGRAM_TO }}
- telegram_token: ${{ secrets.TELEGRAM_TOKEN }}
- event: ${{ toJson(github.event) }}
.github/workflows/tests_codestyle.ymldiffbeforeafterboth--- a/.github/workflows/tests_codestyle.yml
+++ b/.github/workflows/tests_codestyle.yml
@@ -6,13 +6,14 @@
- develop
types:
- opened
- - edited
+ - reopened
+ - synchronize
jobs:
build:
runs-on: self-hosted-ci
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Install modules
run: cd tests && yarn
- name: Run ESLint
Dockerfile-parachaindiffbeforeafterboth--- a/Dockerfile-parachain
+++ /dev/null
@@ -1,107 +0,0 @@
-# ===== Rust builder =====
-FROM phusion/baseimage:focal-1.1.0 as rust-builder
-LABEL maintainer="Unique.Network"
-
-ARG RUST_TOOLCHAIN=nightly-2022-05-11
-#ARG RUST_C=1.62.0-nightly
-ARG POLKA_VERSION=release-v0.9.24
-ARG UNIQUE_BRANCH=develop
-
-#ARG USER=***
-#ARG PASS=***
-
-
-ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
-#ENV RUST_C $RUST_C
-ENV POLKA_VERSION $POLKA_VERSION
-ENV UNIQUE_BRANCH $UNIQUE_BRANCH
-
-
-#RUN echo $RUST_TOOLCHAIN
-#RUN echo $RUST_C
-#RUN echo $POLKA_VERSION
-#RUN echo $UNIQUE_BRANCH
-
-ENV CARGO_HOME="/cargo-home"
-ENV PATH="/cargo-home/bin:$PATH"
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
-RUN apt-get update && \
- apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
- apt-get install -y cmake pkg-config libssl-dev git clang
-
-RUN rustup toolchain uninstall $(rustup toolchain list) && \
- rustup toolchain install $RUST_TOOLCHAIN && \
- rustup default $RUST_TOOLCHAIN && \
- rustup target list --installed && \
- rustup show
-RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
-
-RUN cargo install cargo-chef
-
-RUN mkdir unique_parachain
-WORKDIR /unique_parachain
-
-# ===== Chef =====
-FROM rust-builder as chef
-
-COPY . .
-RUN cargo chef prepare --recipe-path recipe.json
-
-# ===== BUILD ======
-FROM rust-builder as builder
-
-RUN mkdir unique_parachain
-WORKDIR /unique_parachain
-
-COPY --from=chef /unique_parachain/recipe.json recipe.json
-ARG PROFILE=release
-RUN cargo chef cook "--$PROFILE" --recipe-path recipe.json
-
-COPY . .
-RUN cargo build "--$PROFILE"
- # && \
- # cargo test
-
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-RUN mkdir unique_parachain
-WORKDIR /unique_parachain
-
-RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
- cd polkadot && \
- git tag -n && \
- cargo build --release
-
-# ===== RUN ======
-
-FROM phusion/baseimage:focal-1.1.0
-
-ARG PROFILE=release
-
-RUN apt-get -y update && \
- apt-get -y upgrade && \
- apt-get -y install curl git && \
- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
- export NVM_DIR="$HOME/.nvm" && \
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- nvm install v15.5.0 && \
- nvm use v15.5.0
-
-RUN git clone https://github.com/paritytech/polkadot-launch
-
-RUN export NVM_DIR="$HOME/.nvm" && \
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- cd /polkadot-launch && \
- npm install --global yarn && \
- yarn
-
-COPY --from=builder /unique_parachain/target/$PROFILE/unique-collator /unique-chain/target/$PROFILE/
-COPY --from=builder-polkadot /unique_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/
-
-CMD export NVM_DIR="$HOME/.nvm" && \
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- cd /polkadot-launch && \
- yarn start launch-config.json
docker-compose-tests-parachain.ymldiffbeforeafterboth--- a/docker-compose-tests-parachain.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-version: "3.5"
-
-services:
- blockchain_nodes:
- build:
- context: ./
- dockerfile: Dockerfile-parachain
- args:
- - RUST_TOOLCHAIN=${RUST_TOOLCHAIN:?err}
- - RUST_C=${RUST_C:?err}
- - POLKA_VERSION=${POLKA_VERSION:?err}
- - UNIQUE_BRANCH=${UNIQUE_BRANCH:?err}
- volumes:
- - ./launch-config.json:/polkadot-launch/launch-config.json
- env_file:
- - ./.env
-
- integration_tests:
- build:
- context: tests/
- dockerfile: Dockerfile-tests
- environment:
- RPC_URL: http://blockchain_nodes:9933/
- volumes:
- - ./tests/src/config_docker.ts:/unique_parachain/src/config.ts
- - /home/ubuntu/mochawesome-report:/unique_parachain/mochawesome-report
- depends_on:
- - blockchain_nodes