git.delta.rocks / unique-network / refs/commits / 402513001f17

difftreelog

Merge pull request #679 from UniqueNetwork/fix/ci-release-v930031

Yaroslav Bolyukin2022-10-24parents: #86869e3 #79511a9.patch.diff
in: master
Fix/ci release v930031

5 files changed

modified.docker/Dockerfile-parachaindiffbeforeafterboth
--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -1,3 +1,6 @@
+ARG POLKADOT_BUILD_BRANCH
+FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
+
 # ===== Rust builder =====
 FROM ubuntu:20.04 as rust-builder
 LABEL maintainer="Unique.Network"
@@ -36,7 +39,6 @@
 ARG REPO_URL=
 ARG BRANCH=
 
-
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $BRANCH . && \
@@ -57,7 +59,7 @@
       nvm install v16.16.0 && \
       nvm use v16.16.0
 
-RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing
+RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network
 
 RUN export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
@@ -68,11 +70,10 @@
 COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
 COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json
 
-COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
     yarn start launch-config.json
-
modified.docker/Dockerfile-parachain-node-onlydiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-node-only
+++ b/.docker/Dockerfile-parachain-node-only
@@ -1,3 +1,6 @@
+ARG POLKADOT_BUILD_BRANCH
+FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
+
 # ===== Rust builder =====
 FROM ubuntu:20.04 as rust-builder
 LABEL maintainer="Unique.Network"
@@ -82,8 +85,10 @@
 
 COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
 COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
+COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm
 
-COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
before · .docker/Dockerfile-parachain-upgrade
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"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21    rustup toolchain install $RUST_TOOLCHAIN && \22    rustup default $RUST_TOOLCHAIN && \23    rustup target list --installed && \24    rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2627RUN mkdir /unique_parachain28WORKDIR /unique_parachain2930# ===== BUILD current version ======31FROM rust-builder as builder-unique-current3233ARG PROFILE=release34ARG FEATURE=35ARG MAINNET_BRANCH=36ARG REPO_URL=3738WORKDIR /unique_parachain3940RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \41    cargo build --features=$FEATURE --$PROFILE4243# ===== BUILD target version ======44FROM rust-builder as builder-unique-target4546ARG PROFILE=release47ARG FEATURE=48ARG BRANCH=49ARG REPO_URL=5051COPY . /unique_parachain52WORKDIR /unique_parachain5354RUN cargo build --features=$FEATURE --$PROFILE5556# ===== RUN ======5758FROM ubuntu:20.045960ARG RUNTIME=61ENV RUNTIME $RUNTIME62ARG POLKADOT_BUILD_BRANCH=63ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6465RUN apt-get -y update && \66    apt-get -y install curl git && \67    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \68    export NVM_DIR="$HOME/.nvm" && \69    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \70    nvm install v16.16.0 && \71    nvm use v16.16.07273RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network7475RUN export NVM_DIR="$HOME/.nvm" && \76    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \77    cd /polkadot-launch && \78    npm install --global yarn && \79    yarn install8081RUN echo "$RUNTIME"82RUN echo "$POLKADOT_BUILD_BRANCH"8384COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/85COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/8687COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/8889CMD export NVM_DIR="$HOME/.nvm" && \90    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \91    cd /polkadot-launch && \92    yarn start launch-config.json --test-upgrade-parachains
after · .docker/Dockerfile-parachain-upgrade
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot34# ===== Rust builder =====5FROM ubuntu:20.04 as rust-builder6LABEL maintainer="Unique.Network"78ARG RUST_TOOLCHAIN=910ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN11ENV CARGO_HOME="/cargo-home"12ENV PATH="/cargo-home/bin:$PATH"13ENV TZ=UTC14RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1516RUN apt-get update && \17    apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \18    apt-get clean && \19    rm -r /var/lib/apt/lists/*2021RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2223RUN rustup toolchain uninstall $(rustup toolchain list) && \24    rustup toolchain install $RUST_TOOLCHAIN && \25    rustup default $RUST_TOOLCHAIN && \26    rustup target list --installed && \27    rustup show28RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2930RUN mkdir /unique_parachain31WORKDIR /unique_parachain3233# ===== BUILD current version ======34FROM rust-builder as builder-unique-current3536ARG PROFILE=release37ARG FEATURE=38ARG MAINNET_BRANCH=39ARG REPO_URL=4041WORKDIR /unique_parachain4243RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \44    cargo build --features=$FEATURE --$PROFILE4546# ===== BUILD target version ======47FROM rust-builder as builder-unique-target4849ARG PROFILE=release50ARG FEATURE=51ARG BRANCH=52ARG REPO_URL=5354COPY . /unique_parachain55WORKDIR /unique_parachain5657RUN cargo build --features=$FEATURE --$PROFILE5859# ===== RUN ======6061FROM ubuntu:20.046263ARG RUNTIME=64ENV RUNTIME $RUNTIME65ARG POLKADOT_BUILD_BRANCH=66ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6768RUN apt-get -y update && \69    apt-get -y install curl git && \70    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \71    export NVM_DIR="$HOME/.nvm" && \72    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \73    nvm install v16.16.0 && \74    nvm use v16.16.07576RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network7778RUN export NVM_DIR="$HOME/.nvm" && \79    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \80    cd /polkadot-launch && \81    npm install --global yarn && \82    yarn install8384RUN echo "$RUNTIME"85RUN echo "$POLKADOT_BUILD_BRANCH"8687COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/88COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/89COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm9091COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/92COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm9394CMD export NVM_DIR="$HOME/.nvm" && \95    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \96    cd /polkadot-launch && \97    yarn start launch-config.json --test-upgrade-parachains
modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -1,3 +1,6 @@
+ARG POLKADOT_BUILD_BRANCH
+FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
+
 # ===== Rust builder =====
 FROM ubuntu:20.04 as rust-builder
 LABEL maintainer="Unique.Network"
@@ -72,7 +75,7 @@
     nvm install v16.16.0 && \
     nvm use v16.16.0
 
-RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b feature/parachain-forking
+RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b unique-network
 
 RUN export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
@@ -86,10 +89,12 @@
 
 COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
 COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
+COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm
 
 COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/
 
-COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm
 
 CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
modified.docker/Dockerfile-try-runtimediffbeforeafterboth
--- a/.docker/Dockerfile-try-runtime
+++ b/.docker/Dockerfile-try-runtime
@@ -46,4 +46,4 @@
     echo "Fork from: $REPLICA_FROM\n" && \
     cargo build --features=$FEATURE --release
 
-CMD cargo run --features=try-runtime,$FEATURE --release -- try-runtime --no-spec-name-check on-runtime-upgrade live --uri $REPLICA_FROM
+CMD cargo run --features=try-runtime,$FEATURE --release -- try-runtime --no-spec-check-panic on-runtime-upgrade live --uri $REPLICA_FROM