Skip to content

Commit

Permalink
Add PG15 support to Docker image
Browse files Browse the repository at this point in the history
This reverts commit ff66df6.
  • Loading branch information
syvb committed Dec 19, 2022
1 parent 23eed1c commit f4d5304
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,9 @@ jobs:
run: su postgres -c 'sh tools/build -pg${{ matrix.pgversion }} test-extension 2>&1'

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

- name: Run binary update tests
# TODO: remove this once TimescaleDB supports PostgreSQL 15: issue #648
if: ${{ matrix.pgversion != 15 }}
run: |
su postgres -c 'OS_NAME=debian OS_VERSION=11 tools/testbin -version no -bindir / -pgversions ${{ matrix.pgversion }} ci 2>&1'
Expand Down
12 changes: 3 additions & 9 deletions docker/ci/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,10 @@ EOF
yum -q -y install \
postgresql$pg-devel \
postgresql$pg-server \
timescaledb-2-postgresql-$pg
# 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 @@ -195,13 +192,10 @@ EOF
apt-get -qq install \
postgresql-$pg \
postgresql-server-dev-$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
# 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

# Ubuntu is the only system we want an image for that sticks an extra
Expand Down
2 changes: 0 additions & 2 deletions tools/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
# 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'

CARGO_EDIT=0.11.2

Expand Down

0 comments on commit f4d5304

Please sign in to comment.