Skip to content

Commit 8feba03

Browse files
committed
Install TimescaleDB where possible
1 parent b67da6e commit 8feba03

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,13 @@ jobs:
6868
run: su postgres -c 'sh tools/build -pg${{ matrix.pgversion }} test-extension 2>&1'
6969

7070
- name: Run doc tests
71+
# TODO: remove this once TimescaleDB supports PostgreSQL 15
72+
if: ${{ matrix.pgversion != 15 }}
7173
run: su postgres -c 'sh tools/build -pg${{ matrix.pgversion }} test-doc 2>&1'
7274

7375
- name: Run binary update tests
76+
# TODO: remove this once TimescaleDB supports PostgreSQL 15
77+
if: ${{ matrix.pgversion != 15 }}
7478
run: |
7579
su postgres -c 'OS_NAME=debian OS_VERSION=11 tools/testbin -version no -bindir / -dbroot /tmp/db -pgport 28800 -pgversions ${{ matrix.pgversion }} ci 2>&1'
7680

docker/ci/setup.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,13 @@ EOF
127127
yum -q -y install \
128128
postgresql$pg-devel \
129129
postgresql$pg-server \
130-
# timescaledb-2-postgresql-$pg
131130
# We install as user postgres, so that needs write access to these.
132131
chown $BUILDER_USERNAME $PG_BASE$pg/lib $PG_BASE$pg/share/extension
133132
done
133+
for pg in $TSDB_PG_VERSIONS; do
134+
yum -q -y install \
135+
timescaledb-2-postgresql-$pg
136+
done
134137

135138
gem install fpm -v $FPM_VERSION -N
136139
;;
@@ -187,12 +190,15 @@ EOF
187190
apt-get -qq install \
188191
postgresql-$pg \
189192
postgresql-server-dev-$pg
190-
# timescaledb packages Recommend toolkit, which we don't want here.
191-
# apt-get -qq install --no-install-recommends timescaledb-2-postgresql-$pg
192193
# We install as user postgres, so that needs write access to these.
193194
chown $BUILDER_USERNAME $PG_BASE$pg/lib /usr/share/postgresql/$pg/extension
194195
done
195196

197+
for pg in $TSDB_PG_VERSIONS; do
198+
# timescaledb packages Recommend toolkit, which we don't want here.
199+
apt-get -qq install --no-install-recommends timescaledb-2-postgresql-$pg
200+
done
201+
196202
# Ubuntu is the only system we want an image for that sticks an extra
197203
# copy of the default PATH into PAM's /etc/environment and we su or sudo
198204
# to $BUILDER_USERNAME thereby picking up that PATH and clobbering the

tools/dependencies.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# information across all those.
99

1010
PG_VERSIONS='12 13 14 15'
11+
TSDB_PG_VERSIONS='12 13 14'
1112

1213
CARGO_EDIT=0.11.2
1314

0 commit comments

Comments
 (0)