This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion-python.git
The following commit(s) were added to refs/heads/main by this push:
new 47dd8e5 Fix Mac/Win release builds in CI (#313)
47dd8e5 is described below
commit 47dd8e573956f6dcfb6d378b08e17ced25264700
Author: Andy Grove <[email protected]>
AuthorDate: Tue Apr 4 08:54:38 2023 -0600
Fix Mac/Win release builds in CI (#313)
---
.github/workflows/build.yml | 21 ++++++++-------------
Cargo.toml | 3 ++-
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5d31994..6296bf4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,17 +52,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Setup Cpp
- uses: aminya/setup-cpp@v1
- with:
- compiler: gcc
- vcvarsall: ${{ contains(matrix.os, 'windows') }}
- cmake: true
- ninja: true
- vcpkg: true
- cppcheck: true
- clangtidy: true
-
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
@@ -84,6 +73,12 @@ jobs:
name: python-wheel-license
path: .
+ - name: Install Protoc
+ uses: arduino/setup-protoc@v1
+ with:
+ version: '3.x'
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+
- name: Build Python package
run: maturin build --release --strip
@@ -126,7 +121,7 @@ jobs:
target: x86_64
manylinux: auto
rustup-components: rust-std rustfmt # Keep them in one line due to
https://github.com/PyO3/maturin-action/issues/153
- args: --release --manylinux 2014
+ args: --release --manylinux 2014 --features protoc
- name: Archive wheels
uses: actions/upload-artifact@v3
with:
@@ -152,7 +147,7 @@ jobs:
rust-toolchain: stable
manylinux: auto
rustup-components: rust-std rustfmt
- args: --release --sdist --out dist
+ args: --release --sdist --out dist --features protoc
- name: Archive wheels
uses: actions/upload-artifact@v3
with:
diff --git a/Cargo.toml b/Cargo.toml
index 1a51e61..bf6cfe9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,6 +30,7 @@ include = ["/src", "/LICENSE.txt"]
[features]
default = ["mimalloc"]
+protoc = [ "datafusion-substrait/protoc" ]
[dependencies]
tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread",
"sync"] }
@@ -40,7 +41,7 @@ datafusion-common = { git =
"https://github.com/apache/arrow-datafusion.git";, re
datafusion-expr = { git = "https://github.com/apache/arrow-datafusion.git";,
rev = "2191a69" }
datafusion-optimizer = { git =
"https://github.com/apache/arrow-datafusion.git";, rev = "2191a69" }
datafusion-sql = { git = "https://github.com/apache/arrow-datafusion.git";, rev
= "2191a69" }
-datafusion-substrait = { git =
"https://github.com/apache/arrow-datafusion.git";, rev = "2191a69", features =
["protoc"] }
+datafusion-substrait = { git =
"https://github.com/apache/arrow-datafusion.git";, rev = "2191a69" }
uuid = { version = "1.2", features = ["v4"] }
mimalloc = { version = "0.1", optional = true, default-features = false }
async-trait = "0.1"
