Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

Commit

Permalink
Revert "Generate Rust files from protobuf files on each build"
Browse files Browse the repository at this point in the history
This reverts commit f64a16a.
  • Loading branch information
danieldk committed Oct 18, 2019
1 parent e24ec21 commit 451fa45
Show file tree
Hide file tree
Showing 23 changed files with 21,070 additions and 23 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*~

target/
sticker-tf-proto/src/*.rs

.eggs
__pycache__
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
dist: bionic
dist: xenial
env:
global:
- PROJECT_NAME: sticker
addons:
apt:
packages:
- patchelf
- protobuf-compiler
homebrew:
packages:
- protobuf
matrix:
fast_finish: true
include:
Expand Down
30 changes: 15 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions sticker-tf-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ repository = "https://github.com/danieldk/sticker.git"
license = "Apache-2.0"

[dependencies]
protobuf = "2"
# This is annoying, but the generated protobuf contains
# the version number in symbols and compilation fails when
# this dependency is updated
protobuf = "= 2.8.0"

[build-dependencies]
protoc-rust = "2"
protoc-rust = { version = "2", optional = true }

[features]
proto-compile = [ "protoc-rust" ]
1 change: 1 addition & 0 deletions sticker-tf-proto/build.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
fn main() {
#[cfg(feature = "proto-compile")]
protoc_rust::run(protoc_rust::Args {
out_dir: "src",
input: &[
Expand Down
Loading

0 comments on commit 451fa45

Please sign in to comment.