From f39f6b3d2438f0b2d04eaa2c385ec564e3c844a4 Mon Sep 17 00:00:00 2001
From: Sean Corfield <sean@corfield.org>
Date: Thu, 27 Mar 2025 10:30:55 -0700
Subject: [PATCH] re-enable xtdb testing using beta6

instead of nightly

Signed-off-by: Sean Corfield <sean@corfield.org>
---
 .github/workflows/test-and-release.yml  | 2 +-
 .github/workflows/test-and-snapshot.yml | 2 +-
 .github/workflows/test.yml              | 2 +-
 deps.edn                                | 4 ++--
 docker-compose.yml                      | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
index 11e6fe2..891eb89 100644
--- a/.github/workflows/test-and-release.yml
+++ b/.github/workflows/test-and-release.yml
@@ -44,7 +44,7 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: testing
           NEXT_JDBC_TEST_MYSQL: yes
-          # NEXT_JDBC_TEST_XTDB: yes
+          NEXT_JDBC_TEST_XTDB: yes
           NEXT_JDBC_TEST_MSSQL: yes
           MSSQL_SA_PASSWORD: Str0ngP4ssw0rd
       - name: Deploy Release
diff --git a/.github/workflows/test-and-snapshot.yml b/.github/workflows/test-and-snapshot.yml
index 289c13d..3d9eb91 100644
--- a/.github/workflows/test-and-snapshot.yml
+++ b/.github/workflows/test-and-snapshot.yml
@@ -42,7 +42,7 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: testing
           NEXT_JDBC_TEST_MYSQL: yes
-          # NEXT_JDBC_TEST_XTDB: yes
+          NEXT_JDBC_TEST_XTDB: yes
           NEXT_JDBC_TEST_MSSQL: yes
           MSSQL_SA_PASSWORD: Str0ngP4ssw0rd
       - name: Deploy Snapshot
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9f3cc2d..cd9b86f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,6 +42,6 @@ jobs:
         env:
           MYSQL_ROOT_PASSWORD: testing
           NEXT_JDBC_TEST_MYSQL: yes
-          # NEXT_JDBC_TEST_XTDB: yes
+          NEXT_JDBC_TEST_XTDB: yes
           NEXT_JDBC_TEST_MSSQL: yes
           MSSQL_SA_PASSWORD: Str0ngP4ssw0rd
diff --git a/deps.edn b/deps.edn
index 643d2d9..769659f 100644
--- a/deps.edn
+++ b/deps.edn
@@ -40,8 +40,8 @@
                       io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "17.4.0"}
                       org.xerial/sqlite-jdbc {:mvn/version "3.49.1.0"}
                       com.microsoft.sqlserver/mssql-jdbc {:mvn/version "12.10.0.jre11"}
-                      ;; prerelease XTDB JDBC module:
-                      com.xtdb/xtdb-jdbc {:mvn/version "2.0.0-SNAPSHOT"}
+                      ;; only need the XTDB JDBC module:
+                      com.xtdb/xtdb-jdbc {:mvn/version "2.0.0-beta6"}
                       ;; use log4j2 to reduce log noise during testing:
                       org.apache.logging.log4j/log4j-api {:mvn/version "2.24.3"}
                       ;; bridge everything into log4j:
diff --git a/docker-compose.yml b/docker-compose.yml
index a6095e2..64ce025 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     ports:
       - "1433:1433"
   xtdb:
-    image: ghcr.io/xtdb/xtdb:nightly
-    pull_policy: always
+    image: ghcr.io/xtdb/xtdb:latest
+    # pull_policy: always
     ports:
       - "5432:5432"