Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Pre-build protoc from source #585

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/kuksa_databroker-cli_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ jobs:
steps:
- name: Installing JVM
run: sudo apt update && sudo apt-get install -y default-jre
- name: Install Protoc
run: sudo apt-get install -y protobuf-compiler
- uses: actions/checkout@v3
- name: cargo fmt
working-directory: ${{github.workspace}}
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/kuksa_databroker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ jobs:
steps:
- name: Installing JVM
run: sudo apt update && sudo apt-get install -y default-jre
- name: Install Protoc
run: sudo apt-get install -y protobuf-compiler
- uses: actions/checkout@v3
- name: cargo fmt
working-directory: ${{github.workspace}}
Expand All @@ -60,8 +58,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Install Protoc
run: sudo apt-get install -y protobuf-compiler
- uses: actions/checkout@v3
- uses: actions-rs/install@v0.1
with:
Expand Down
1 change: 1 addition & 0 deletions kuksa_databroker/databroker-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ prost-types = { workspace = true }

[build-dependencies]
tonic-build = { workspace = true, features = ["transport", "prost"] }
protobuf-src = "1.1.0"
1 change: 1 addition & 0 deletions kuksa_databroker/databroker-proto/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
********************************************************************************/

fn main() -> Result<(), Box<dyn std::error::Error>> {
std::env::set_var("PROTOC", protobuf_src::protoc());
tonic_build::configure()
.compile_well_known_types(false)
.protoc_arg("--experimental_allow_proto3_optional")
Expand Down