Skip to content

Commit 1caf8cd

Browse files
[DO NOT MERGE UNTIL PG16 GA] updating postgres major version to 16 (#62)
* updating postgres major version to 16 * using version 16.2 * adding v16 to workflow * testing * changing back to 16 * remove EOL stack images and PG versions * remove heroku-18 in compile * removing 18 from build step * add pkg-config * i don't think this change was necessary --------- Co-authored-by: Valerie Woolard <[email protected]>
1 parent 256f93f commit 1caf8cd

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

.github/workflows/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ jobs:
66
test:
77
strategy:
88
matrix:
9-
stack: [heroku-18, heroku-20, heroku-22]
10-
pg_version: ["", "9.6", "10", "11", "11.7", "12", "13", "14", "15"]
9+
stack: [heroku-20, heroku-22]
10+
pg_version: ["", "12", "13", "14", "15", "16"]
1111
runs-on: ubuntu-latest
1212

1313
steps:

bin/compile

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ BUILDPACK_DIR="$(dirname $(dirname $0))"
1818

1919
# config
2020
S3_BUCKET="ci-database-binary"
21-
POSTGRESQL_MAJOR_VERSION=15
21+
POSTGRESQL_MAJOR_VERSION=16
2222
if [ -f "$ENV_DIR/POSTGRESQL_VERSION" ]
2323
then
2424
POSTGRESQL_MAJOR_VERSION="$(cat $ENV_DIR/POSTGRESQL_VERSION)"
2525
fi
2626

2727
case "$POSTGRESQL_MAJOR_VERSION" in
28+
16) POSTGRESQL_VERSION="16.2";;
2829
15) POSTGRESQL_VERSION="15.2";;
2930
14) POSTGRESQL_VERSION="14.5";;
3031
13) POSTGRESQL_VERSION="13.8";;

support/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ FROM $BASE_IMAGE
44
ARG STACK_FOLDER
55
ENV STACK_FOLDER=$STACK_FOLDER
66

7-
MAINTAINER gregburek
8-
97
RUN apt-get -q update
10-
RUN apt-get -q -y install curl gcc g++ make wget unzip build-essential libreadline-dev zlib1g-dev flex bison libkrb5-dev libssl-dev libxml2-dev libxslt1-dev
8+
RUN apt-get -q -y install curl gcc g++ make wget unzip build-essential libreadline-dev zlib1g-dev flex bison libkrb5-dev libssl-dev libxml2-dev libxslt1-dev pkg-config
119

1210
RUN wget -q https://github.com/rlmcpherson/s3gof3r/releases/download/v0.5.0/gof3r_0.5.0_linux_amd64.tar.gz
1311
RUN tar zxf gof3r_0.5.0_linux_amd64.tar.gz

support/build-postgresql

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fi
2828

2929
for PGSQL_VERSION in "${PGSQL_VERSIONS[@]}"; do
3030
PGSQL_VERSION=$(echo "$PGSQL_VERSION" | tr -d '[:space:]') # '12.2 ' -> '12.2'
31-
for stack in heroku-{18,20,22}; do
31+
for stack in heroku-{20,22}; do
3232
echo "Building PG $PGSQL_VERSION for $stack..."
3333
BASE_IMAGE="heroku/${stack/-/:}" # heroku-22 -> heroku/heroku:22
3434
docker build \

support/pg_versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.6.24;10.22;11.17;12.12;13.8;14.5;15.2
1+
12.12;13.8;14.5;15.2;16.2

0 commit comments

Comments
 (0)