From 91cf06e25a1b0284d33fca9a89599bf71f45619a Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Thu, 20 Oct 2022 20:07:59 +0000 Subject: [PATCH] ci: install protoc Substrate now requires it --- --- a/.docker/Dockerfile-acala.j2 +++ b/.docker/Dockerfile-acala.j2 @@ -8,7 +8,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* --- a/.docker/Dockerfile-chain-dev +++ b/.docker/Dockerfile-chain-dev @@ -11,7 +11,7 @@ RUN echo "$FEATURE\n" && echo "$RUST_TOOLCHAIN\n" -RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake +RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake protobuf-compiler RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none @@ -20,7 +20,7 @@ rustup default $RUST_TOOLCHAIN && \ rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN -RUN mkdir /dev_chain +RUN mkdir /dev_chain COPY . /dev_chain WORKDIR /dev_chain --- a/.docker/Dockerfile-chain-dev-unit +++ b/.docker/Dockerfile-chain-dev-unit @@ -3,7 +3,7 @@ ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Etc/UTC -RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake +RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake protobuf-compiler ENV CARGO_HOME="/cargo-home" ENV PATH="/cargo-home/bin:$PATH" @@ -18,7 +18,7 @@ rustup default $RUST_TOOLCHAIN && \ rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN -RUN mkdir /dev_chain +RUN mkdir /dev_chain COPY . /dev_chain WORKDIR /dev_chain --- a/.docker/Dockerfile-cumulus.j2 +++ b/.docker/Dockerfile-cumulus.j2 @@ -8,7 +8,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* --- a/.docker/Dockerfile-moonbeam.j2 +++ b/.docker/Dockerfile-moonbeam.j2 @@ -8,7 +8,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -38,4 +38,4 @@ FROM ubuntu:20.04 as builder-moonbeam -COPY --from=builder-moonbeam-bin /unique_parachain/moonbeam/target/release/moonbeam /unique_parachain/moonbeam/target/release/moonbeam \ No newline at end of file +COPY --from=builder-moonbeam-bin /unique_parachain/moonbeam/target/release/moonbeam /unique_parachain/moonbeam/target/release/moonbeam --- a/.docker/Dockerfile-parachain +++ b/.docker/Dockerfile-parachain @@ -11,7 +11,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* --- a/.docker/Dockerfile-parachain-node-only +++ b/.docker/Dockerfile-parachain-node-only @@ -11,7 +11,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* --- a/.docker/Dockerfile-parachain-upgrade +++ b/.docker/Dockerfile-parachain-upgrade @@ -11,7 +11,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* --- a/.docker/Dockerfile-parachain-upgrade-data +++ b/.docker/Dockerfile-parachain-upgrade-data @@ -11,7 +11,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* --- a/.docker/Dockerfile-testnet.j2 +++ b/.docker/Dockerfile-testnet.j2 @@ -8,7 +8,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -71,5 +71,3 @@ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ cd /polkadot-launch && \ yarn start launch-config.json - - \ No newline at end of file --- a/.docker/Dockerfile-try-runtime +++ b/.docker/Dockerfile-try-runtime @@ -12,7 +12,7 @@ RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -45,5 +45,5 @@ RUN echo "Requested features: $FEATURE\n" && \ 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 --- a/.docker/Dockerfile-xcm.j2 +++ b/.docker/Dockerfile-xcm.j2 @@ -8,7 +8,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -82,4 +82,3 @@ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ cd /polkadot-launch && \ yarn start launch-config-xcm-{{ NETWORK }}.json - --- a/.docker/additional/xcm-rococo/Dockerfile-xcm-opal-rococo +++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-opal-rococo @@ -13,7 +13,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -85,5 +85,3 @@ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ cd /polkadot-launch && \ yarn start ${LAUNCH_CONFIG_FILE} - - --- a/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo +++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo @@ -13,7 +13,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -89,5 +89,3 @@ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ cd /polkadot-launch && \ yarn start ${LAUNCH_CONFIG_FILE} - - --- a/.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo +++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo @@ -13,7 +13,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update && \ - apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \ + apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \ apt-get clean && \ rm -r /var/lib/apt/lists/* @@ -89,5 +89,3 @@ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ cd /polkadot-launch && \ yarn start ${LAUNCH_CONFIG_FILE} - - --- a/.github/workflows/codestyle_v2.yml +++ b/.github/workflows/codestyle_v2.yml @@ -15,7 +15,7 @@ toolchain: nightly default: true target: wasm32-unknown-unknown - components: rustfmt, clippy + components: rustfmt, clippy - name: Run cargo fmt run: cargo fmt -- --check # In that mode it returns only exit code. - name: Cargo fmt state @@ -26,12 +26,12 @@ clippy: if: ${{ false }} runs-on: self-hosted-ci - + steps: - + - uses: actions/checkout@v3 - name: Install substrate dependencies - run: sudo apt-get install libssl-dev pkg-config libclang-dev clang + run: sudo apt-get install libssl-dev pkg-config libclang-dev clang protobuf-compiler - name: Install latest nightly uses: actions-rs/toolchain@v1 with: --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ 1. Install Rust: ```bash -sudo apt-get install git curl libssl-dev llvm pkg-config libclang-dev clang make cmake +sudo apt-get install git curl libssl-dev llvm pkg-config libclang-dev clang make cmake protobuf-compiler curl https://sh.rustup.rs -sSf | sh ``` -- gitstuff