Skip to content

Commit b75f689

Browse files
maxb2matt.anderson
andauthored
Fix/features (#2)
fix: pipeline --------- Co-authored-by: matt.anderson <matt.anderson@veteransunited.com>
1 parent 2921077 commit b75f689

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

.github/workflows/release.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
rust-toolchain: 1.65.0
4848
maturin-version: v0.14.15
4949
command: build
50-
args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28
50+
args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
5151
env:
5252
SQLITE3_STATIC: 1
5353

@@ -61,15 +61,15 @@ jobs:
6161
rust-toolchain: 1.65.0
6262
maturin-version: v0.14.15
6363
command: build
64-
args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28
64+
args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
6565
env:
6666
SQLITE3_STATIC: 1
6767

6868
# - uses: PyO3/maturin-action@v1
6969
# with:
7070
# maturin-version: v0.14.15
7171
# command: build
72-
# args: -m connectorx-python/Cargo.toml --target aarch64-unknown-linux-gnu -i python --release --manylinux 2_28
72+
# args: -m connectorx-python/Cargo.toml --target aarch64-unknown-linux-gnu -i python --release --manylinux 2_28 --features integrated-auth-gssapi
7373
# env:
7474
# SQLITE3_STATIC: 1
7575

@@ -84,6 +84,9 @@ jobs:
8484
matrix:
8585
os: ["windows-latest", "macos-10.15"]
8686
python-version: ["3.8", "3.9", "3.10", "3.11"]
87+
include:
88+
- os: "macos-10.15"
89+
features: "--features integrated-auth-gssapi"
8790
steps:
8891
- uses: actions/checkout@v2
8992

@@ -117,7 +120,7 @@ jobs:
117120
rust-toolchain: 1.65.0
118121
maturin-version: v0.14.15
119122
command: build
120-
args: -m connectorx-python/Cargo.toml -i python --release
123+
args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
121124
env:
122125
SQLITE3_STATIC: 1
123126

@@ -131,7 +134,7 @@ jobs:
131134
rust-toolchain: 1.65.0
132135
maturin-version: v0.14.15
133136
command: build
134-
args: -m connectorx-python/Cargo.toml -i python --release
137+
args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
135138
env:
136139
SQLITE3_STATIC: 1
137140

@@ -178,7 +181,7 @@ jobs:
178181
rust-toolchain: 1.65.0
179182
maturin-version: v0.14.15
180183
command: build
181-
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release
184+
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release --features integrated-auth-gssapi
182185
env:
183186
SQLITE3_STATIC: 1
184187

@@ -192,7 +195,7 @@ jobs:
192195
rust-toolchain: 1.65.0
193196
maturin-version: v0.14.15
194197
command: build
195-
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release
198+
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release --features integrated-auth-gssapi
196199
env:
197200
SQLITE3_STATIC: 1
198201

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

connectorx-python/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,4 @@ srcs = [
7676
"connectorx/src_oracle",
7777
"connectorx/src_bigquery",
7878
]
79+
integrated-auth-gssapi = ["connectorx/integrated-auth-gssapi"]

connectorx/Cargo.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ uuid = {version = "0.8", optional = true}
5858
j4rs = {version = "0.13", optional = true}
5959
datafusion = {version = "14", optional = true}
6060

61-
[target.'cfg(unix)'.dependencies]
62-
libgssapi = { version = "0.4.5", optional = true, default-features = false }
63-
6461
[lib]
6562
crate-type = ["cdylib", "rlib"]
6663
name = "connectorx"
@@ -72,7 +69,7 @@ iai = "0.1"
7269
pprof = {version = "0.5", features = ["flamegraph"]}
7370

7471
[features]
75-
all = ["src_sqlite", "src_postgres", "src_mysql", "src_mssql", "src_oracle", "src_bigquery", "src_csv", "src_dummy", "dst_arrow", "dst_arrow2", "federation", "fed_exec", "integrated-auth-gssapi"]
72+
all = ["src_sqlite", "src_postgres", "src_mysql", "src_mssql", "src_oracle", "src_bigquery", "src_csv", "src_dummy", "dst_arrow", "dst_arrow2", "federation", "fed_exec"]
7673
branch = []
7774
default = ["fptr"]
7875
dst_arrow = ["arrow"]
@@ -102,6 +99,7 @@ src_postgres = [
10299
src_sqlite = ["rusqlite", "r2d2_sqlite", "fallible-streaming-iterator", "r2d2", "urlencoding"]
103100
federation = ["j4rs"]
104101
fed_exec = ["datafusion", "tokio"]
105-
integrated-auth-gssapi = ["libgssapi"]
102+
integrated-auth-gssapi = ["tiberius/integrated-auth-gssapi"]
103+
106104
[package.metadata.docs.rs]
107105
features = ["all"]

0 commit comments

Comments
 (0)