Skip to content

Commit

Permalink
Install protobuf via Docker instead
Browse files Browse the repository at this point in the history
  • Loading branch information
garious committed Jul 21, 2019
1 parent 7581257 commit 9ebdaf7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 125 deletions.
12 changes: 11 additions & 1 deletion ci/docker-rust/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
# ci/rust-version.sh to pick up the new image tag
FROM rust:1.36.0

# Add Google Protocol Buffers for Libra's metrics library.
ENV PROTOC_VERSION 3.8.0
ENV PROTOC_ZIP protoc-$PROTOC_VERSION-linux-x86_64.zip

RUN set -x \
&& apt update \
&& apt-get install apt-transport-https \
Expand All @@ -20,6 +24,8 @@ RUN set -x \
mscgen \
rsync \
sudo \
golang \
unzip \
\
&& rm -rf /var/lib/apt/lists/* \
&& rustup component add rustfmt \
Expand All @@ -28,4 +34,8 @@ RUN set -x \
&& cargo install svgbob_cli \
&& cargo install mdbook \
&& rustc --version \
&& cargo --version
&& cargo --version \
&& curl -OL https://github.com/google/protobuf/releases/download/v$PROTOC_VERSION/$PROTOC_ZIP \
&& unzip -o $PROTOC_ZIP -d /usr/local bin/protoc \
&& unzip -o $PROTOC_ZIP -d /usr/local include/* \
&& rm -f $PROTOC_ZIP
1 change: 0 additions & 1 deletion ci/test-bench.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ _ cargo +$rust_nightly bench --manifest-path programs/bpf/Cargo.toml ${V:+--verb
-- -Z unstable-options --format=json --nocapture | tee -a "$BENCH_FILE"

# Run Move tests
scripts/dev_setup.sh
_ cargo +"$rust_nightly" test --manifest-path=programs/move_loader_program/Cargo.toml ${V:+--verbose}

# TODO: debug why solana-upload-perf takes over 30 minutes to complete.
Expand Down
123 changes: 0 additions & 123 deletions scripts/dev_setup.sh

This file was deleted.

0 comments on commit 9ebdaf7

Please sign in to comment.