Merge #667

667: Add option to build TimescaleDB in CI r=Smittyvb a=Smittyvb

Adds an option to manually run the CI using an arbitrary TimescaleDB commit. You can also optionally specify a TimescaleDB repo to test the CI with a fork of TimescaleDB.

Co-authored-by: Smitty <[email protected]>

Author: bors[bot]

.github/workflows/ci.yml

@@ -14,6 +14,14 @@ on:
       container-image:
         description: 'Container image to pull from DockerHub'
         required: false
+      tsdb-commit:
+        description: 'TimescaleDB commit to use'
+        default: ''
+        required: false
+      tsdb-repo:
+        description: 'TimescaleDB repo to use'
+        default: 'https://github.com/timescale/timescaledb.git'
+        required: false
 
 jobs:
   testpostgres:
@@ -22,6 +30,7 @@ jobs:
     container:
       image: ${{ inputs.container-image || 'timescaledev/toolkit-builder:debian-11-amd64' }}
     strategy:
+      fail-fast: false
       matrix:
         pgversion: [12, 13, 14, 15]
     env:
@@ -55,6 +64,10 @@ jobs:
     - name: chown Repository
       run: chown -R postgres .
 
+    - name: Build and install TimescaleDB
+      if: ${{ inputs.tsdb-commit != '' }}
+      run: ./tools/install-timescaledb '${{ matrix.pgversion }}' '${{ inputs.tsdb-repo }}' '${{ inputs.tsdb-commit }}'
+
     # TODO After the container image contains a primed target dir, is this still worth it?
     #   Only possible advantage is this one is per-pg-version but what's the impact?
     - name: Cache cargo target dir

docker/ci/setup.sh

@@ -153,15 +153,18 @@ EOF
             # - libssl-dev
             # - make
             # - pkg-config
+            # cmake and libkrb5-dev are needed to build TimescaleDB
             apt-get -qq install \
                     build-essential \
+                    cmake \
                     curl \
                     debhelper \
                     ed \
                     fakeroot \
                     gcc \
                     git \
                     gnupg \
+                    libkrb5-dev \
                     libssl-dev \
                     make \
                     pkg-config \

tools/install-timescaledb

@@ -0,0 +1,9 @@
+#!/bin/sh
+git clone "$2" timescaledb
+cd timescaledb
+git switch --detach "$3"
+mkdir build
+cd build
+# this overwrites the files from the TimescaleDB package
+cmake .. -DUSE_OPENSSL=0 -DLINTER=0 -DCMAKE_PROGRAM_PATH=/usr/lib/postgresql/$1/bin
+make install