Skip to content

Commit 24a62c5

Browse files
authored
Bump timescaledb to 2.10.0 (#851)
* Bump timescaledb to 2.10.0 * Revert "Don't try building timescaledb for PG15 (#828)"
1 parent ea67744 commit 24a62c5

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed

postgres-appliance/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG BASE_IMAGE=ubuntu:22.04
22
ARG PGVERSION=15
3-
ARG TIMESCALEDB="1.7.5 2.3.1 2.9.3"
3+
ARG TIMESCALEDB="1.7.5 2.3.1 2.10.0"
44
ARG DEMO=false
55
ARG COMPRESS=false
66
ARG ADDITIONAL_LOCALES=

postgres-appliance/build_scripts/base.sh

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -129,25 +129,22 @@ for version in $DEB_PG_SUPPORTED_VERSIONS; do
129129

130130
# Install 3rd party stuff
131131

132-
# don't try to build timescaledb for pg15. Remove, when it is officially supported.
133-
if [ "$version" != "15" ]; then
134-
# use subshell to avoid having to cd back (SC2103)
135-
(
136-
cd timescaledb
137-
for v in $TIMESCALEDB; do
138-
git checkout "$v"
139-
sed -i "s/VERSION 3.11/VERSION 3.10/" CMakeLists.txt
140-
if BUILD_FORCE_REMOVE=true ./bootstrap -DREGRESS_CHECKS=OFF -DWARNINGS_AS_ERRORS=OFF \
141-
-DTAP_CHECKS=OFF -DPG_CONFIG="/usr/lib/postgresql/$version/bin/pg_config" \
142-
-DAPACHE_ONLY="$TIMESCALEDB_APACHE_ONLY" -DSEND_TELEMETRY_DEFAULT=NO; then
143-
make -C build install
144-
strip /usr/lib/postgresql/"$version"/lib/timescaledb*.so
145-
fi
146-
git reset --hard
147-
git clean -f -d
148-
done
149-
)
150-
fi
132+
# use subshell to avoid having to cd back (SC2103)
133+
(
134+
cd timescaledb
135+
for v in $TIMESCALEDB; do
136+
git checkout "$v"
137+
sed -i "s/VERSION 3.11/VERSION 3.10/" CMakeLists.txt
138+
if BUILD_FORCE_REMOVE=true ./bootstrap -DREGRESS_CHECKS=OFF -DWARNINGS_AS_ERRORS=OFF \
139+
-DTAP_CHECKS=OFF -DPG_CONFIG="/usr/lib/postgresql/$version/bin/pg_config" \
140+
-DAPACHE_ONLY="$TIMESCALEDB_APACHE_ONLY" -DSEND_TELEMETRY_DEFAULT=NO; then
141+
make -C build install
142+
strip /usr/lib/postgresql/"$version"/lib/timescaledb*.so
143+
fi
144+
git reset --hard
145+
git clean -f -d
146+
done
147+
)
151148

152149
if [ "${TIMESCALEDB_APACHE_ONLY}" != "true" ] && [ "${TIMESCALEDB_TOOLKIT}" = "true" ]; then
153150
__versionCodename=$(sed </etc/os-release -ne 's/^VERSION_CODENAME=//p')

0 commit comments

Comments
 (0)