git.delta.rocks / unique-network / refs/commits / afc5a29e9399

difftreelog

Re-created branch

Alexander Aksenov2022-08-10parent: #0d95470.patch.diff
in: master

7 files changed

modified.docker/Dockerfile-chain-devdiffbeforeafterboth
1010
11RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none11RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
1212
13ARG RUST_TOOLCHAIN=nightly-2022-05-1113ARG RUST_TOOLCHAIN=
14ARG POLKA_VERSION=release-v0.9.24
15ARG BRANCH=14ARG BRANCH=
16ARG REPO_URL=15ARG REPO_URL=
17ARG FEATURE=16ARG FEATURE=
modified.docker/Dockerfile-parachaindiffbeforeafterboth
2FROM ubuntu:20.04 as rust-builder2FROM ubuntu:20.04 as rust-builder
3LABEL maintainer="Unique.Network"3LABEL maintainer="Unique.Network"
44
5ARG RUST_TOOLCHAIN=nightly-2022-05-115ARG RUST_TOOLCHAIN=
66
7ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN7ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
8ENV CARGO_HOME="/cargo-home"8ENV CARGO_HOME="/cargo-home"
9ENV PATH="/cargo-home/bin:$PATH"9ENV PATH="/cargo-home/bin:$PATH"
1010
11RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
1211
13RUN 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/*
1716
17RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
18
18RUN 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 show
23RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN24RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
2425
25
26RUN mkdir /unique_parachain26RUN mkdir /unique_parachain
27WORKDIR /unique_parachain27WORKDIR /unique_parachain
2828
29
29# ===== BUILD ======30# ===== BUILD ======
30FROM rust-builder as builder-unique31FROM rust-builder as builder-unique
3132
32ARG PROFILE=release33ARG PROFILE=release
33ARG FEATURE=34ARG FEATURE=
35ARG REPO_URL=
36ARG BRANCH=
3437
35RUN mkdir /unique_parachain38RUN mkdir /unique_parachain
36WORKDIR /unique_parachain39WORKDIR /unique_parachain
3740
38RUN git clone $REPO_URL -b $BRANCH41RUN git clone $REPO_URL -b $BRANCH
39RUN cargo build $FEATURE --$PROFILE42RUN cargo build $FEATURE --$PROFILE
43
4044
41# ===== BUILD POLKADOT =====45# ===== BUILD POLKADOT =====
42FROM rust-builder as builder-polkadot46FROM rust-builder as builder-polkadot
4347
44ARG POLKA_VERSION=release-v0.9.2448ARG POLKADOT_BUILD_BRANCH=
45ENV POLKA_VERSION $POLKA_VERSION49ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
4650
47RUN mkdir /unique_parachain51RUN mkdir /unique_parachain
48WORKDIR /unique_parachain52WORKDIR /unique_parachain
4953
50RUN 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 --release
5357
56FROM ubuntu:20.0460FROM ubuntu:20.04
5761
58RUN 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" && \
added.docker/docker-compose-master.yamldiffbeforeafterboth

no changes

added.docker/docker-compose.tmp-master.j2diffbeforeafterboth

no changes

modified.docker/docker-compose.tmp.j2diffbeforeafterboth
8 - "BRANCH={{ BRANCH }}"8 - "BRANCH={{ BRANCH }}"
9 - "REPO_URL={{ REPO_URL }}"9 - "REPO_URL={{ REPO_URL }}"
10 - "FEATURE={{ FEATURE }}"10 - "FEATURE={{ FEATURE }}"
11 - "POLKA_VERSION={{ POLKA_VERSION }}"11 - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
1212
13 command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external13 command: cargo run --release {{ FEATURE }} -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
1414
added.github/workflows/build-test-master.ymldiffbeforeafterboth

no changes

modified.github/workflows/node_build_test.ymldiffbeforeafterboth
1616
17#Define Workflow variables17#Define Workflow variables
18env:18env:
19 RUST_TOOLCHAIN: nightly-2022-05-11
20 REPO_URL: ${{ github.server_url }}/${{ github.repository }}19 REPO_URL: ${{ github.server_url }}/${{ github.repository }}
21 POLKA_VERSION: release-v0.9.2420
2221
23# A workflow run is made up of one or more jobs that can run sequentially or in parallel22# A workflow run is made up of one or more jobs that can run sequentially or in parallel
24jobs:23jobs:
59 if: github.event.pull_request.draft == true58 if: github.event.pull_request.draft == true
60 run: exit 159 run: exit 1
6160
62 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it61 - name: Clean Workspace
62 uses: AutoModality/action-clean@v1.1.0
63
64 # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
63 - uses: actions/checkout@v365 - uses: actions/checkout@v3
64 with:66 with:
65 ref: ${{ github.head_ref }} #Checking out head commit67 ref: ${{ github.head_ref }} #Checking out head commit
68
69 - name: Read .env file
70 uses: xom9ikk/dotenv@v1.0.2
6671
67 - name: Generate ENV related extend file for docker-compose72 - name: Generate ENV related extend file for docker-compose
68 uses: cuchi/jinja2-action@v1.2.073 uses: cuchi/jinja2-action@v1.2.0
69 with:74 with:
70 template: .docker/docker-compose.tmp.j275 template: .docker/docker-compose.tmp.j2
71 output_file: .docker/docker-compose.${{ matrix.network }}.yml76 output_file: .docker/docker-compose.${{ matrix.network }}.yml
72 variables: |77 variables: |
73 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git78 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
74 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}79 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
75 POLKA_VERSION=${{ env.POLKA_VERSION }}80 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
76 FEATURE='${{ matrix.features }}'81 FEATURE=${{ matrix.features }}
77 BRANCH=${{ github.head_ref }}82 BRANCH=${{ github.head_ref }}
7883
79 - name: Show build configuration84 - name: Show build configuration
80 run: cat .docker/docker-compose.${{ matrix.network }}.yml85 run: cat .docker/docker-compose.${{ matrix.network }}.yml