Fix/features (#2)

fix: pipeline --------- Co-authored-by: matt.anderson <[email protected]>
sfu-db · Apr 4, 2023 · b75f689 · b75f689
1 parent 2921077
commit b75f689
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -47,7 +47,7 @@ jobs:
           rust-toolchain: 1.65.0
           maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28
+          args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
         env:
           SQLITE3_STATIC: 1
 
@@ -61,15 +61,15 @@ jobs:
           rust-toolchain: 1.65.0
           maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28
+          args: -m connectorx-python/Cargo.toml -i python --release --manylinux 2_28 --features integrated-auth-gssapi
         env:
           SQLITE3_STATIC: 1
 
       # - uses: PyO3/maturin-action@v1
       #   with:
       #     maturin-version: v0.14.15
       #     command: build
-      #     args: -m connectorx-python/Cargo.toml --target aarch64-unknown-linux-gnu -i python --release --manylinux 2_28
+      #     args: -m connectorx-python/Cargo.toml --target aarch64-unknown-linux-gnu -i python --release --manylinux 2_28 --features integrated-auth-gssapi
       #   env:
       #     SQLITE3_STATIC: 1
 
@@ -84,6 +84,9 @@ jobs:
       matrix:
         os: ["windows-latest", "macos-10.15"]
         python-version: ["3.8", "3.9", "3.10", "3.11"]
+        include:
+          - os: "macos-10.15"
+            features: "--features integrated-auth-gssapi"
     steps:
       - uses: actions/checkout@v2
 
@@ -117,7 +120,7 @@ jobs:
           rust-toolchain: 1.65.0
           maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml -i python --release
+          args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
         env:
           SQLITE3_STATIC: 1
 
@@ -131,7 +134,7 @@ jobs:
           rust-toolchain: 1.65.0
           maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml -i python --release
+          args: -m connectorx-python/Cargo.toml -i python --release ${{ matrix.features }}
         env:
           SQLITE3_STATIC: 1
 
@@ -178,7 +181,7 @@ jobs:
           rust-toolchain: 1.65.0
           maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release
+          args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release  --features integrated-auth-gssapi
         env:
           SQLITE3_STATIC: 1
 
@@ -192,7 +195,7 @@ jobs:
           rust-toolchain: 1.65.0
           maturin-version: v0.14.15
           command: build
-          args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release
+          args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --release  --features integrated-auth-gssapi
         env:
           SQLITE3_STATIC: 1
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/connectorx-python/Cargo.toml b/connectorx-python/Cargo.toml
@@ -76,3 +76,4 @@ srcs = [
   "connectorx/src_oracle",
   "connectorx/src_bigquery",
 ]
+integrated-auth-gssapi = ["connectorx/integrated-auth-gssapi"]
diff --git a/connectorx/Cargo.toml b/connectorx/Cargo.toml
@@ -58,9 +58,6 @@ uuid = {version = "0.8", optional = true}
 j4rs = {version = "0.13", optional = true}
 datafusion = {version = "14", optional = true}
 
-[target.'cfg(unix)'.dependencies]
-libgssapi = { version = "0.4.5", optional = true, default-features = false }
-
 [lib]
 crate-type = ["cdylib", "rlib"]
 name = "connectorx"
@@ -72,7 +69,7 @@ iai = "0.1"
 pprof = {version = "0.5", features = ["flamegraph"]}
 
 [features]
-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"]
+all = ["src_sqlite", "src_postgres", "src_mysql", "src_mssql", "src_oracle", "src_bigquery", "src_csv", "src_dummy", "dst_arrow", "dst_arrow2", "federation", "fed_exec"]
 branch = []
 default = ["fptr"]
 dst_arrow = ["arrow"]
@@ -102,6 +99,7 @@ src_postgres = [
 src_sqlite = ["rusqlite", "r2d2_sqlite", "fallible-streaming-iterator", "r2d2", "urlencoding"]
 federation = ["j4rs"]
 fed_exec = ["datafusion", "tokio"]
-integrated-auth-gssapi = ["libgssapi"]
+integrated-auth-gssapi = ["tiberius/integrated-auth-gssapi"]
+
 [package.metadata.docs.rs]
 features = ["all"]