hasura · soupi · Oct 25, 2023 · Oct 24, 2023 · Oct 24, 2023 · Oct 24, 2023
diff --git a/.github/test-configuration.json b/.github/test-configuration.json
@@ -1,12 +1,4 @@
 {
-  "ndc-citus": {
-    "package": "ndc-citus",
-    "flags": "",
-    "services": "citus",
-    "env": {
-      "POSTGRESQL_CONNECTION_STRING": "postgresql://postgres:password@localhost:64004"
-    }
-  },
   "ndc-cockroach": {
     "package": "ndc-cockroach",
     "flags": "",

diff --git a/.github/workflows/build-images-and-deploy.yaml b/.github/workflows/build-images-and-deploy.yaml
@@ -14,7 +14,6 @@ jobs:
     strategy:
       matrix:
         connector:
-          - ndc-citus
           - ndc-cockroach
           - ndc-postgres
       fail-fast: false

diff --git a/.github/workflows/cargo-test.yaml b/.github/workflows/cargo-test.yaml
@@ -38,7 +38,6 @@ jobs:
     strategy:
       matrix:
         package:
-          - ndc-citus
           - ndc-cockroach
           - ndc-postgres-12
           - ndc-postgres-13
@@ -190,3 +189,40 @@ jobs:
           cargo nextest run --no-fail-fast --release -p other-db-tests --features yugabyte
         env:
           RUST_LOG: INFO
+
+  test-ndc-postgres-with-citus:
+    name: test connector (ndc-postgres on Citus)
+    runs-on: ubuntu-latest
+    env:
+      CARGO_NET_GIT_FETCH_WITH_CLI: "true"
+      RUSTFLAGS: "-D warnings" # fail on warnings
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install protoc
+        uses: arduino/setup-protoc@v2
+        with:
+          version: "24.3"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: install tools
+        run: |
+          rustup show
+          # install cargo-nextest
+          curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: start dependencies
+        uses: isbang/[email protected]
+        with:
+          compose-file: "./docker-compose.yaml"
+          down-flags: "--volumes"
+          services: |
+            citus
+
+      - name: run tests
+        run: |
+          cargo nextest run --no-fail-fast --release -p other-db-tests --features citus
+        env:
+          RUST_LOG: INFO
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,6 @@ package.edition = "2021"
 package.license = "Apache-2.0"
 
 members = [
-  "crates/connectors/ndc-citus",
   "crates/connectors/ndc-cockroach",
   "crates/connectors/ndc-postgres",
   "crates/query-engine/execution",

diff --git a/crates/connectors/ndc-citus/Cargo.toml b/crates/connectors/ndc-citus/Cargo.toml
diff --git a/crates/connectors/ndc-citus/bin/main.rs b/crates/connectors/ndc-citus/bin/main.rs
diff --git a/crates/connectors/ndc-citus/src/connector.rs b/crates/connectors/ndc-citus/src/connector.rs
diff --git a/crates/connectors/ndc-citus/src/lib.rs b/crates/connectors/ndc-citus/src/lib.rs
diff --git a/crates/connectors/ndc-citus/tests/configuration_tests.rs b/crates/connectors/ndc-citus/tests/configuration_tests.rs