chore:use protobuf-src to install

SkyUOI · Jun 25, 2024 · 5ba72e8 · 5ba72e8
1 parent bd22c40
commit 5ba72e8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/rust_linux.yml b/.github/workflows/rust_linux.yml
@@ -17,8 +17,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Config Env
         run: rustup install nightly && rustup default nightly && rustup component add rustfmt
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v2
       - name: Build
         run: cd gdrust && cargo build --all
       - name: Build Release

diff --git a/.github/workflows/rust_macos.yml b/.github/workflows/rust_macos.yml
@@ -17,8 +17,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Config Env
         run: rustup install nightly && rustup default nightly
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v2
       - name: Build
         run: cd gdrust && cargo build --all
       - name: Build Release

diff --git a/.github/workflows/rust_windows.yml b/.github/workflows/rust_windows.yml
@@ -17,8 +17,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Config Env
         run: rustup install nightly && rustup default nightly
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v2
       - name: Build
         run: cd gdrust && cargo build --all
       - name: Build Release

diff --git a/gdrust/Cargo.lock b/gdrust/Cargo.lock
diff --git a/gdrust/proto/Cargo.toml b/gdrust/proto/Cargo.toml
@@ -9,3 +9,4 @@ prost-types = { version = "0", optional = true }
 
 [build-dependencies]
 prost-build = "0"
+protobuf-src = "2"
diff --git a/gdrust/proto/build.rs b/gdrust/proto/build.rs
@@ -1,4 +1,5 @@
 fn main() {
+    std::env::set_var("PROTOC", protobuf_src::protoc());
     println!("cargo:rerun-if-changed=proto");
     prost_build::Config::new()
         .out_dir("src/proto")

diff --git a/rust.gdextension b/rust.gdextension
@@ -8,6 +8,8 @@ linux.debug.x86_64 =     "res://gdrust/target/debug/libgdrust.so"
 linux.release.x86_64 =   "res://gdrust/target/release/libgdrust.so"
 windows.debug.x86_64 =   "res://gdrust/target/debug/gdrust.dll"
 windows.release.x86_64 = "res://gdrust/target/release/gdrust.dll"
+#windows.debug.x86_64 =   "res://gdrust/target/x86_64-pc-windows-gnu/debug/gdrust.dll"
+#windows.release.x86_64 = "res://gdrust/target/x86_64-pc-windows-gnu/release/gdrust.dll"
 macos.debug =            "res://gdrust/target/debug/libgdrust.dylib"
 macos.release =          "res://gdrust/target/release/libgdrust.dylib"
 macos.debug.arm64 =      "res://gdrust/target/debug/libgdrust.dylib"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ prost-types = { version = "0", optional = true }

		[build-dependencies]
		prost-build = "0"
		protobuf-src = "2"