difftreelog
Build Args definition has been changed. Docker linting notices has been fixed.
in: master
5 files changed
.docker/Dockerfile-chain-devdiffbeforeafterboth--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -10,8 +10,8 @@
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 POLKADOT_BUILD_BRANCH=
ARG BRANCH=
ARG REPO_URL=
ARG FEATURE=
@@ -26,4 +26,4 @@
RUN cargo build --release
-CMD cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
+CMD cargo run --release --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
.docker/Dockerfile-parachaindiffbeforeafterboth--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -2,19 +2,21 @@
FROM ubuntu:20.04 as rust-builder
LABEL maintainer="Unique.Network"
-ARG RUST_TOOLCHAIN=nightly-2022-05-11
+ARG RUST_TOOLCHAIN=
ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
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 install -y cmake 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/*
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
+
RUN rustup toolchain uninstall $(rustup toolchain list) && \
rustup toolchain install $RUST_TOOLCHAIN && \
rustup default $RUST_TOOLCHAIN && \
@@ -31,23 +33,25 @@
ARG PROFILE=release
ARG FEATURE=
+ARG REPO_URL=
+ARG BRANCH=
RUN mkdir /unique_parachain
WORKDIR /unique_parachain
-RUN git clone $REPO_URL -b $BRANCH
-RUN cargo build $FEATURE --$PROFILE
+RUN git clone $REPO_URL -b $BRANCH && \
+ cargo build --features=$FEATURE --$PROFILE
# ===== BUILD POLKADOT =====
FROM rust-builder as builder-polkadot
-ARG POLKA_VERSION=release-v0.9.24
-ENV POLKA_VERSION $POLKA_VERSION
+ARG POLKADOT_BUILD_BRANCH=
+ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
RUN mkdir /unique_parachain
WORKDIR /unique_parachain
-RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
+RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
cd polkadot && \
cargo build --release
.docker/Dockerfile-parachain-upgradediffbeforeafterboth--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -40,8 +40,8 @@
RUN mkdir /unique_parachain
WORKDIR /unique_parachain
-RUN git clone $REPO_URL -b $MAINNET_BRANCH .
-RUN cargo build --features=$FEATURE --$PROFILE
+RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
+ cargo build --features=$FEATURE --$PROFILE
# ===== BUILD target version ======
@@ -55,11 +55,8 @@
RUN mkdir /unique_parachain
WORKDIR /unique_parachain
-RUN git clone $REPO_URL -b $BRANCH .
-RUN cargo build --features=$FEATURE --$PROFILE
-
-RUN ls -la /unique_parachain
-RUN ls -la /unique_parachain/target/release/wbuild
+RUN git clone $REPO_URL -b $BRANCH . && \
+ cargo build --features=$FEATURE --$PROFILE
# ===== BUILD POLKADOT =====
FROM rust-builder as builder-polkadot
.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 --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
.github/workflows/node_build_test.ymldiffbeforeafterboth1name: Develop - Build & test23# Controls when the action will run.4on:5 # Triggers the workflow on push or pull request events but only for the master branch6 pull_request:7 branches:8 - develop9 types:10 - opened11 - reopened12 - synchronize #commit(s) pushed to the pull request1314 # Allows you to run this workflow manually from the Actions tab15 workflow_dispatch:1617#Define Workflow variables18env:19 RUST_TOOLCHAIN: nightly-2022-05-1120 REPO_URL: ${{ github.server_url }}/${{ github.repository }}21 POLKA_VERSION: release-v0.9.242223# A workflow run is made up of one or more jobs that can run sequentially or in parallel24jobs:25 build:26 # The type of runner that the job will run on27 runs-on: self-hosted-ci2829 name: Build Container, Spin it Up an test3031 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.3233 strategy:34 matrix:35 include:36 - network: "Opal"37 features: "--features=opal-runtime"38 - network: "Quartz"39 features: "--features=quartz-runtime"40 - network: "Unique"41 features: "--features=unique-runtime"4243 steps:44 - name: Skip if pull request is in Draft45 # `if: github.event.pull_request.draft == true` should be kept here, at46 # the step level, rather than at the job level. The latter is not47 # recommended because when the PR is moved from "Draft" to "Ready to48 # review" the workflow will immediately be passing (since it was skipped),49 # even though it hasn't actually ran, since it takes a few seconds for50 # the workflow to start. This is also disclosed in:51 # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/1752 # That scenario would open an opportunity for the check to be bypassed:53 # 1. Get your PR approved54 # 2. Move it to Draft55 # 3. Push whatever commits you want56 # 4. Move it to "Ready for review"; now the workflow is passing (it was57 # skipped) and "Check reviews" is also passing (it won't be updated58 # until the workflow is finished)59 if: github.event.pull_request.draft == true60 run: exit 16162 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it63 - uses: actions/checkout@v364 with:65 ref: ${{ github.head_ref }} #Checking out head commit6667 - name: Generate ENV related extend file for docker-compose68 uses: cuchi/jinja2-action@v1.2.069 with:70 template: .docker/docker-compose.tmp.j271 output_file: .docker/docker-compose.${{ matrix.network }}.yml72 variables: |73 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git74 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}75 POLKA_VERSION=${{ env.POLKA_VERSION }}76 FEATURE='${{ matrix.features }}'77 BRANCH=${{ github.head_ref }}7879 - name: Show build configuration80 run: cat .docker/docker-compose.${{ matrix.network }}.yml8182 - name: Build the stack83 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build8485 - uses: actions/setup-node@v386 with:87 node-version: 168889 - name: Run tests90 run: |91 cd tests92 yarn install93 yarn add mochawesome94 echo "Ready to start tests"95 node scripts/readyness.js96 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}97 env:98 RPC_URL: http://127.0.0.1:9933/99100 - name: Test Report101 uses: phoenix-actions/test-reporting@v8102 if: success() || failure() # run this step even if previous step failed103 with:104 name: Tests ${{ matrix.network }} # Name of the check run which will be created105 path: tests/mochawesome-report/test-*.json # Path to test results106 reporter: mochawesome-json107 fail-on-error: 'false'108109 - name: Read output variables110 run: |111 echo "url is ${{ steps.test-report.outputs.runHtmlUrl }}"112113 - name: Stop running containers114 if: always() # run this step always115 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down