From e9499e6d9f5237d0cbeed63cacb2f282b1c86a0e Mon Sep 17 00:00:00 2001
From: Joshua Lockerman <josh@timescale.com>
Date: Wed, 17 Nov 2021 12:19:21 -0500
Subject: [PATCH] TimescaleDB does support 14?

---
 .github/workflows/ci.yml | 11 +++++------
 docker/ci/Dockerfile     |  7 +++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e79ed6b..25514422 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -171,10 +171,9 @@ jobs:
       run: |
         sudo -HEsu postgres sh -c "/usr/local/cargo/bin/cargo pgx stop pg14 && /usr/local/cargo/bin/cargo pgx start pg14"
         RUST_BACKTRACE=short cargo run --manifest-path ./tools/post-install/Cargo.toml /home/postgres/.pgx/14.0/pgx-install/bin/pg_config
-        cargo run --manifest-path ./tools/testrunner/Cargo.toml -- -h localhost -p 28813
+        cargo run --manifest-path ./tools/testrunner/Cargo.toml -- -h localhost -p 28814
 
-    # TODO These require TimescaleDB to support pg14
-    # - name: Run Doc Tests
-    #   run: |
-    #     sudo -HEsu postgres sh -c "/usr/local/cargo/bin/cargo pgx stop pg14 && /usr/local/cargo/bin/cargo pgx start pg14"
-    #     sql-doctester -h localhost -s "CREATE EXTENSION timescaledb; CREATE EXTENSION timescaledb_toolkit; SET SESSION TIMEZONE TO 'UTC'" -p 28813 docs
\ No newline at end of file
+    - name: Run Doc Tests
+      run: |
+        sudo -HEsu postgres sh -c "/usr/local/cargo/bin/cargo pgx stop pg14 && /usr/local/cargo/bin/cargo pgx start pg14"
+        sql-doctester -h localhost -s "CREATE EXTENSION timescaledb; CREATE EXTENSION timescaledb_toolkit; SET SESSION TIMEZONE TO 'UTC'" -p 28814 docs
\ No newline at end of file
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
index 432c544f..dbece77e 100644
--- a/docker/ci/Dockerfile
+++ b/docker/ci/Dockerfile
@@ -40,6 +40,13 @@ RUN set -ex \
         && make -j4 \
         && make -j4 install \
         && echo "shared_preload_libraries = 'timescaledb'" >> ~/.pgx/data-13/postgresql.conf \
+    && cd .. \
+    && rm -rf ./build \
+        && ./bootstrap -DPG_CONFIG=~/.pgx/14.0/pgx-install/bin/pg_config -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DUSE_OPENSSL=false -DSEND_TELEMETRY_DEFAULT=false -DREGRESS_CHECKS=false \
+        && cd build \
+        && make -j4 \
+        && make -j4 install \
+        && echo "shared_preload_libraries = 'timescaledb'" >> ~/.pgx/data-14/postgresql.conf \
     && cd ~ \
     && rm -rf ~/timescaledb