Fix windows release builds (#26986)

* Don't try to build protobuf-src on windows

* Set protoc envar
This commit is contained in:
Tyera Eulberg 2022-08-08 08:42:12 -07:00 committed by GitHub
parent dc9a9238d5
commit 46b3ecee55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 2 deletions

View File

@ -50,6 +50,7 @@ jobs:
choco install openssl
export OPENSSL_DIR="C:\Program Files\OpenSSL-Win64"
choco install protoc
export PROTOC="C:\ProgramData\chocolatey\lib\protoc\tools\bin\protoc.exe"
source /tmp/env.sh
echo "::set-output name=tag::$CI_TAG"
eval "$(ci/channel-info.sh)"

View File

@ -12,5 +12,9 @@ version = "1.12.0"
[workspace]
[dependencies]
protobuf-src = "1.0.5"
tonic-build = "0.8.0"
# windows users should install the protobuf compiler manually and set the PROTOC
# envar to point to the installed binary
[target."cfg(not(windows))".dependencies]
protobuf-src = "1.0.5"

View File

@ -1,6 +1,7 @@
fn main() -> Result<(), std::io::Error> {
const PROTOC_ENVAR: &str = "PROTOC";
if std::env::var(PROTOC_ENVAR).is_err() {
#[cfg(not(windows))]
std::env::set_var(PROTOC_ENVAR, protobuf_src::protoc());
}

View File

@ -29,5 +29,9 @@ name = "solana_storage_proto"
targets = ["x86_64-unknown-linux-gnu"]
[build-dependencies]
protobuf-src = "1.0.5"
tonic-build = "0.8.0"
# windows users should install the protobuf compiler manually and set the PROTOC
# envar to point to the installed binary
[target."cfg(not(windows))".build-dependencies]
protobuf-src = "1.0.5"

View File

@ -1,6 +1,7 @@
fn main() -> Result<(), std::io::Error> {
const PROTOC_ENVAR: &str = "PROTOC";
if std::env::var(PROTOC_ENVAR).is_err() {
#[cfg(not(windows))]
std::env::set_var(PROTOC_ENVAR, protobuf_src::protoc());
}