Merge #302

302: TimescaleDB does support 14? r=JLockerman a=JLockerman



Co-authored-by: Joshua Lockerman <[email protected]>

Author: bors[bot]

.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
+    - 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

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