difftreelog
Re-created branch
in: master
7 files changed
.docker/Dockerfile-chain-devdiffbeforeafterboth--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -10,8 +10,7 @@
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-ARG RUST_TOOLCHAIN=nightly-2022-05-11
-ARG POLKA_VERSION=release-v0.9.24
+ARG RUST_TOOLCHAIN=
ARG BRANCH=
ARG REPO_URL=
ARG FEATURE=
.docker/Dockerfile-parachaindiffbeforeafterboth2FROM ubuntu:20.04 as rust-builder2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"3LABEL maintainer="Unique.Network"445ARG RUST_TOOLCHAIN=nightly-2022-05-115ARG RUST_TOOLCHAIN=667ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN7ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"9ENV PATH="/cargo-home/bin:$PATH"101011RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none121113RUN apt-get update && \12RUN apt-get update && \14 apt-get install -y cmake pkg-config libssl-dev git clang && \13 apt-get install -y curl cmake pkg-config libssl-dev git clang && \15 apt-get clean && \14 apt-get clean && \16 rm -r /var/lib/apt/lists/*15 rm -r /var/lib/apt/lists/*171617RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1818RUN rustup toolchain uninstall $(rustup toolchain list) && \19RUN rustup toolchain uninstall $(rustup toolchain list) && \19 rustup toolchain install $RUST_TOOLCHAIN && \20 rustup toolchain install $RUST_TOOLCHAIN && \20 rustup default $RUST_TOOLCHAIN && \21 rustup default $RUST_TOOLCHAIN && \21 rustup target list --installed && \22 rustup target list --installed && \22 rustup show23 rustup show23RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN24RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN24252526RUN mkdir /unique_parachain26RUN mkdir /unique_parachain27WORKDIR /unique_parachain27WORKDIR /unique_parachain28282929# ===== BUILD ======30# ===== BUILD ======30FROM rust-builder as builder-unique31FROM rust-builder as builder-unique313232ARG PROFILE=release33ARG PROFILE=release33ARG FEATURE=34ARG FEATURE=35ARG REPO_URL=36ARG BRANCH=343735RUN mkdir /unique_parachain38RUN mkdir /unique_parachain36WORKDIR /unique_parachain39WORKDIR /unique_parachain374038RUN git clone $REPO_URL -b $BRANCH41RUN git clone $REPO_URL -b $BRANCH39RUN cargo build $FEATURE --$PROFILE42RUN cargo build $FEATURE --$PROFILE43404441# ===== BUILD POLKADOT =====45# ===== BUILD POLKADOT =====42FROM rust-builder as builder-polkadot46FROM rust-builder as builder-polkadot434744ARG POLKA_VERSION=release-v0.9.2448ARG POLKADOT_BUILD_BRANCH=45ENV POLKA_VERSION $POLKA_VERSION49ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH465047RUN mkdir /unique_parachain51RUN mkdir /unique_parachain48WORKDIR /unique_parachain52WORKDIR /unique_parachain495350RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \54RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \51 cd polkadot && \55 cd polkadot && \52 cargo build --release56 cargo build --release535756FROM ubuntu:20.0460FROM ubuntu:20.04576158RUN apt-get -y update && \62RUN apt-get -y update && \59 apt-get -y upgrade && \60 apt-get -y install curl git && \63 apt-get -y install curl git && \61 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \64 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \62 export NVM_DIR="$HOME/.nvm" && \65 export NVM_DIR="$HOME/.nvm" && \.docker/docker-compose-master.yamldiffbeforeafterboth--- /dev/null
+++ b/.docker/docker-compose-master.yaml
@@ -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"
.docker/docker-compose.tmp-master.j2diffbeforeafterboth--- /dev/null
+++ b/.docker/docker-compose.tmp-master.j2
@@ -0,0 +1,11 @@
+version: "3.5"
+
+services:
+ blockchain_nodes:
+ build:
+ args:
+ - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
+ - "BRANCH={{ BRANCH }}"
+ - "REPO_URL={{ REPO_URL }}"
+ - "FEATURE={{ FEATURE }}"
+ - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
.docker/docker-compose.tmp.j2diffbeforeafterboth--- a/.docker/docker-compose.tmp.j2
+++ b/.docker/docker-compose.tmp.j2
@@ -8,6 +8,6 @@
- "BRANCH={{ BRANCH }}"
- "REPO_URL={{ REPO_URL }}"
- "FEATURE={{ FEATURE }}"
- - "POLKA_VERSION={{ POLKA_VERSION }}"
+ - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
- command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
+ command: cargo run --release {{ FEATURE }} -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
.github/workflows/build-test-master.ymldiffbeforeafterboth--- /dev/null
+++ b/.github/workflows/build-test-master.yml
@@ -0,0 +1,121 @@
+name: MASTER - Build & Test
+
+# Controls when the action will run.
+on:
+ # Triggers the workflow on push or pull request events but only for the master branch
+ pull_request:
+ branches:
+ - master
+ types:
+ - opened
+ - reopened
+ - synchronize #commit(s) pushed to the pull request
+
+ # Allows you to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+#Define Workflow variables
+env:
+ REPO_URL: ${{ github.server_url }}/${{ github.repository }}
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+
+ build:
+ # The type of runner that the job will run on
+ runs-on: self-hosted-ci
+
+
+ name: Build Container, Spin it Up an test
+
+ continue-on-error: true #Do not stop testing of matrix runs failed.
+
+ strategy:
+ matrix:
+ include:
+ - network: "Opal"
+ features: "--features=opal-runtime"
+ - network: "Quartz"
+ features: "--features=quartz-runtime"
+ - network: "Unique"
+ features: "--features=unique-runtime"
+
+ steps:
+ - name: Skip if pull request is in Draft
+ # `if: github.event.pull_request.draft == true` should be kept here, at
+ # the step level, rather than at the job level. The latter is not
+ # recommended because when the PR is moved from "Draft" to "Ready to
+ # review" the workflow will immediately be passing (since it was skipped),
+ # even though it hasn't actually ran, since it takes a few seconds for
+ # the workflow to start. This is also disclosed in:
+ # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
+ # That scenario would open an opportunity for the check to be bypassed:
+ # 1. Get your PR approved
+ # 2. Move it to Draft
+ # 3. Push whatever commits you want
+ # 4. Move it to "Ready for review"; now the workflow is passing (it was
+ # skipped) and "Check reviews" is also passing (it won't be updated
+ # until the workflow is finished)
+ 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 }}
+
+ - 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:
+ template: .docker/docker-compose.tmp-master.j2
+ output_file: .docker/docker-compose.${{ matrix.network }}.yml
+ variables: |
+ REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
+ RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
+ POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
+ FEATURE=${{ matrix.features }}
+ BRANCH=${{ github.head_ref }}
+
+ - name: Show build configuration
+ run: cat .docker/docker-compose.${{ matrix.network }}.yml
+
+ - name: Build the stack
+ run: docker-compose -f ".docker/docker-compose-master.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build
+
+ - uses: actions/setup-node@v3
+ with:
+ node-version: 16
+
+ - name: Run tests
+ run: |
+ cd tests
+ yarn install
+ yarn add mochawesome
+ echo "Ready to start tests"
+ node scripts/readyness.js
+ NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
+ env:
+ RPC_URL: http://127.0.0.1:9933/
+
+ - name: Test Report
+ uses: phoenix-actions/test-reporting@v8
+ if: success() || failure() # run this step even if previous step failed
+ with:
+ name: Tests ${{ matrix.network }} # Name of the check run which will be created
+ path: tests/mochawesome-report/test-*.json # Path to test results
+ reporter: mochawesome-json
+ fail-on-error: 'false'
+
+ - name: Read output variables
+ 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-master.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down
.github/workflows/node_build_test.ymldiffbeforeafterboth--- a/.github/workflows/node_build_test.yml
+++ b/.github/workflows/node_build_test.yml
@@ -16,10 +16,9 @@
#Define Workflow variables
env:
- RUST_TOOLCHAIN: nightly-2022-05-11
REPO_URL: ${{ github.server_url }}/${{ github.repository }}
- POLKA_VERSION: release-v0.9.24
+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
build:
@@ -59,11 +58,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:
@@ -72,8 +77,8 @@
variables: |
REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
- POLKA_VERSION=${{ env.POLKA_VERSION }}
- FEATURE='${{ matrix.features }}'
+ POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
+ FEATURE=${{ matrix.features }}
BRANCH=${{ github.head_ref }}
- name: Show build configuration