--- a/.docker/Dockerfile-parachain-upgrade +++ b/.docker/Dockerfile-parachain-upgrade @@ -58,6 +58,8 @@ 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 # ===== BUILD POLKADOT ===== FROM rust-builder as builder-polkadot @@ -76,6 +78,9 @@ FROM ubuntu:20.04 +ARG RUNTIME= +ENV RUNTIME $RUNTIME + RUN apt-get -y update && \ apt-get -y install curl git && \ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \ @@ -92,9 +97,15 @@ npm install --global yarn && \ yarn install +RUN echo "$RUNTIME" + 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=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/ +COPY --from=builder-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" && \ --- a/.docker/docker-compose.tmp-forkless.j2 +++ b/.docker/docker-compose.tmp-forkless.j2 @@ -8,6 +8,7 @@ - "BRANCH={{ BRANCH }}" - "REPO_URL={{ REPO_URL }}" - "FEATURE={{ FEATURE }}" + - "RUNTIME={{ RUNTIME }}" - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}" - "MAINNET_TAG={{ MAINNET_TAG }}" - "MAINNET_BRANCH={{ MAINNET_BRANCH }}" --- a/.docker/launch-config.j2 +++ b/.docker/launch-config.j2 @@ -86,9 +86,9 @@ }, "parachains": [ { - "bin": "../unique-chain/current/release/unique-collator", - "upgradeBin": "../unique-chain/target/release/unique-collator", - "upgradeWasm": "../unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm", + "bin": "/unique-chain/current/release/unique-collator", + "upgradeBin": "/unique-chain/target/release/unique-collator", + "upgradeWasm": "/unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm", "id": "1000", "balance": "1000000000000000000000000", "nodes": [ --- a/.github/workflows/forkless-update-nodata.yml +++ b/.github/workflows/forkless-update-nodata.yml @@ -90,6 +90,7 @@ MAINNET_TAG=${{ matrix.mainnet_tag }} MAINNET_BRANCH=${{ matrix.mainnet_branch }} FEATURE=${{ matrix.features }} + RUNTIME=${{ matrix.runtime }} BRANCH=${{ github.head_ref }} - name: Show build configuration