Skip to content

Commit

Permalink
Ensure PostgreSQL 16 is available in Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
feikesteenbergen committed Oct 12, 2023
1 parent 05a1557 commit 873fc9b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
fail-fast: false
max-parallel: 12
matrix:
pgversion: [12, 13, 14, 15]
pgversion: [12, 13, 14, 15, 16]
container: "${{ \
( \
inputs.all-platforms || \
Expand Down
16 changes: 12 additions & 4 deletions docker/ci/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ if $privileged; then
centos | rockylinux)
case $OS_VERSION in
7)
# PostgreSQL packages for 16+ are not available here
PG_VERSIONS="${RHEL7_PG_VERSIONS}"
# Postgresql packages require both
# - llvm-toolset-7-clang from centos-release-scl-rh
# - llvm5.0-devel from epel-release
Expand Down Expand Up @@ -133,10 +135,13 @@ EOF
for pg in $PG_VERSIONS; do
yum -q -y install \
postgresql$pg-devel \
postgresql$pg-server \
timescaledb-2-postgresql-$pg
postgresql$pg-server
# We install as user postgres, so that needs write access to these.
chown $BUILDER_USERNAME $PG_BASE$pg/lib $PG_BASE$pg/share/extension
done;

for pg in $TSDB_PG_VERSIONS; do
yum -q -y install timescaledb-2-postgresql-$pg
done

gem install fpm -v $FPM_VERSION -N
Expand Down Expand Up @@ -198,12 +203,15 @@ EOF
apt-get -qq install \
postgresql-$pg \
postgresql-server-dev-$pg
# timescaledb packages Recommend toolkit, which we don't want here.
apt-get -qq install --no-install-recommends timescaledb-2-postgresql-$pg
# We install as user postgres, so that needs write access to these.
chown $BUILDER_USERNAME $PG_BASE$pg/lib /usr/share/postgresql/$pg/extension
done

for pg in $TSDB_PG_VERSIONS; do
# timescaledb packages Recommend toolkit, which we don't want here.
apt-get -qq install --no-install-recommends timescaledb-2-postgresql-$pg
done

# Ubuntu is the only system we want an image for that sticks an extra
# copy of the default PATH into PAM's /etc/environment and we su or sudo
# to $BUILDER_USERNAME thereby picking up that PATH and clobbering the
Expand Down
7 changes: 4 additions & 3 deletions tools/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
# All our automation scripts read this, so at least we're not duplicating this
# information across all those.

PG_VERSIONS='12 13 14 15'
# TODO: remove this once TimescaleDB supports PostgreSQL 15: issue #648
TSDB_PG_VERSIONS='12 13 14'
PG_VERSIONS='12 13 14 15 16'
RHEL7_PG_VERSIONS='12 13 14 15'
# TODO: remove this once TimescaleDB supports PostgreSQL 16: issue #5752
TSDB_PG_VERSIONS='12 13 14 15'

CARGO_EDIT=0.11.2

Expand Down

0 comments on commit 873fc9b

Please sign in to comment.