Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
Signed-off-by: qupeng <qupeng@pingcap.com>
  • Loading branch information
hicqu committed May 20, 2021
1 parent 712c22a commit f922a5f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,19 @@ cache:
before_cache:
- rm -rf /home/travis/.cargo/registry

before_install:
- export PATH=$HOME/protobuf/bin:$PATH
- export C_INCLUDE_PATH=$C_INCLUDE_PATH:$HOME/protobuf/include
- export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$HOME/protobuf/include

install:
- >
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
mkdir -p $HOME/protobuf && pushd $HOME/protobuf &&
curl -LO "https://github.com/google/protobuf/releases/download/v3.6.0/protoc-3.6.0-linux-x86_64.zip" &&
unzip protoc-3.6.0-linux-x86_64.zip &&
popd;
fi
- if [[ $TRAVIS_RUST_VERSION == "stable" && $TRAVIS_OS_NAME == "linux" ]]; then rustup component add rustfmt; fi
- if [[ $TRAVIS_RUST_VERSION == "stable" && $TRAVIS_OS_NAME == "linux" ]]; then rustup component add clippy; fi

Expand Down
1 change: 0 additions & 1 deletion proto/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use protobuf_build::Builder;

fn main() {
let base = std::env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| ".".to_string());
println!("base: {}", base);
Builder::new()
.search_dir_for_protos(&format!("{}/proto", base))
.includes(&[format!("{}/include", base), format!("{}/proto", base)])
Expand Down

0 comments on commit f922a5f

Please sign in to comment.