sqld: Remove external protoc dependency (#534)

Let's use the `protobuf-src` crate to remove the dependency to external `protoc` to simplify the build process.
libsql · Jul 20, 2023 · 257ca6b · 257ca6b
1 parent 4355422
commit 257ca6b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -24,10 +24,6 @@ jobs:
           profile: minimal
           toolchain: stable
           override: true
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout
         uses: actions/checkout@v3
         with:
@@ -48,10 +44,6 @@ jobs:
           toolchain: stable
           components: clippy
           override: true
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout
         uses: actions/checkout@v3
         with:
@@ -72,10 +64,6 @@ jobs:
           toolchain: stable
           components: rustfmt
           override: true
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout
         uses: actions/checkout@v3
         with:
@@ -114,10 +102,6 @@ jobs:
         profile: minimal
         toolchain: stable
         override: true
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Install foundationdb-clients
       run: wget https://github.com/apple/foundationdb/releases/download/7.1.25/foundationdb-clients_7.1.25-1_amd64.deb && sudo dpkg -i foundationdb-clients_7.1.25-1_amd64.deb
     - uses: actions/checkout@v3
@@ -145,10 +129,6 @@ jobs:
         profile: minimal
         toolchain: stable
         override: true
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Checkout
       uses: actions/checkout@v3
       with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sqld/Cargo.toml b/sqld/Cargo.toml
@@ -70,6 +70,7 @@ aws-sdk-s3 = "0.28"
 
 [build-dependencies]
 prost-build = "0.11.4"
+protobuf-src = "1.1.0"
 tonic-build = "0.8.4"
 vergen = { version = "8", features = ["build", "git", "gitcl"] }
 

diff --git a/sqld/build.rs b/sqld/build.rs
@@ -4,6 +4,8 @@ use vergen::EmitBuilder;
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     EmitBuilder::builder().git_sha(false).all_build().emit()?;
 
+    std::env::set_var("PROTOC", protobuf_src::protoc());
+
     let mut config = Config::new();
     config.bytes([".wal_log"]);
     tonic_build::configure()