Skip to content

Commit 43dcfa5

Browse files
Update CI, README and repo settings for PG17 (#2156)
- Currently, all workflows are targeting the `PG17_prepare` branch, which will be changed to `PG17` once the branch is renamed. - Updated all the github workflows - Updated the README - Updated repo settings - Updated the Dockerfiles
1 parent 7b22343 commit 43dcfa5

File tree

11 files changed

+52
-40
lines changed

11 files changed

+52
-40
lines changed

.asf.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ github:
4949
required_pull_request_reviews:
5050
required_approving_review_count: 2
5151

52+
PG17:
53+
required_pull_request_reviews:
54+
required_approving_review_count: 2
55+
5256
PG16:
5357
required_pull_request_reviews:
5458
required_approving_review_count: 2

.github/labeler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ PG14:
1313
PG15:
1414
- base-branch: 'PG15'
1515

16+
PG17:
17+
- base-branch: 'PG17'
18+
1619
master:
1720
- base-branch: 'master'

.github/workflows/go-driver.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Go Driver Tests
22

33
on:
44
push:
5-
branches: [ "master" ]
5+
branches: [ "PG17_prepare" ]
66

77
pull_request:
8-
branches: [ "master" ]
8+
branches: [ "PG17_prepare" ]
99

1010
jobs:
1111
build:

.github/workflows/installcheck.yaml

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,62 @@ name: Build / Regression
22

33
on:
44
push:
5-
branches: [ "master" ]
5+
branches: [ "PG17_prepare" ]
66
pull_request:
7-
branches: [ "master" ]
7+
branches: [ "PG17_prepare" ]
88

99
jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- name: Get latest commit id of PostgreSQL 16
14+
- name: Get latest commit id of PostgreSQL 17
1515
run: |
16-
echo "PG_COMMIT_HASH=$(git ls-remote git://git.postgresql.org/git/postgresql.git refs/heads/REL_16_STABLE | awk '{print $1}')" >> $GITHUB_ENV
16+
echo "PG_COMMIT_HASH=$(git ls-remote git://git.postgresql.org/git/postgresql.git refs/heads/REL_17_STABLE | awk '{print $1}')" >> $GITHUB_ENV
1717
18-
- name: Cache PostgreSQL 16
18+
- name: Cache PostgreSQL 17
1919
uses: actions/cache@v3
20-
id: pg16cache
20+
id: pg17cache
2121
with:
22-
path: ~/pg16
23-
key: ${{ runner.os }}-v1-pg16-${{ env.PG_COMMIT_HASH }}
22+
path: ~/pg17
23+
key: ${{ runner.os }}-v1-pg17-${{ env.PG_COMMIT_HASH }}
2424

25-
- name: Install PostgreSQL 16 and some extensions
26-
if: steps.pg16cache.outputs.cache-hit != 'true'
25+
- name: Install dependencies
2726
run: |
28-
git clone --depth 1 --branch REL_16_STABLE git://git.postgresql.org/git/postgresql.git ~/pg16source
29-
cd ~/pg16source
30-
./configure --prefix=$HOME/pg16 CFLAGS="-std=gnu99 -ggdb -O0" --enable-cassert
27+
sudo apt-get update
28+
sudo apt-get install -y build-essential libreadline-dev zlib1g-dev flex bison
29+
30+
- name: Install PostgreSQL 17 and some extensions
31+
if: steps.pg17cache.outputs.cache-hit != 'true'
32+
run: |
33+
git clone --depth 1 --branch REL_17_STABLE git://git.postgresql.org/git/postgresql.git ~/pg17source
34+
cd ~/pg17source
35+
./configure --prefix=$HOME/pg17 CFLAGS="-std=gnu99 -ggdb -O0" --enable-cassert
3136
make install -j$(nproc) > /dev/null
3237
cd contrib
3338
cd fuzzystrmatch
34-
make PG_CONFIG=$HOME/pg16/bin/pg_config install -j$(nproc) > /dev/null
39+
make PG_CONFIG=$HOME/pg17/bin/pg_config install -j$(nproc) > /dev/null
3540
cd ../pg_trgm
36-
make PG_CONFIG=$HOME/pg16/bin/pg_config install -j$(nproc) > /dev/null
41+
make PG_CONFIG=$HOME/pg17/bin/pg_config install -j$(nproc) > /dev/null
3742
3843
- uses: actions/checkout@v3
3944

4045
- name: Build AGE
4146
id: build
4247
run: |
43-
make PG_CONFIG=$HOME/pg16/bin/pg_config install -j$(nproc)
48+
make PG_CONFIG=$HOME/pg17/bin/pg_config install -j$(nproc)
4449
4550
- name: Pull and build pgvector
4651
id: pgvector
4752
run: |
4853
git clone https://github.com/pgvector/pgvector.git
4954
cd pgvector
50-
make PG_CONFIG=$HOME/pg16/bin/pg_config install -j$(nproc) > /dev/null
55+
make PG_CONFIG=$HOME/pg17/bin/pg_config install -j$(nproc) > /dev/null
5156
5257
- name: Regression tests
5358
id: regression_tests
5459
run: |
55-
make PG_CONFIG=$HOME/pg16/bin/pg_config installcheck EXTRA_TESTS="pgvector fuzzystrmatch pg_trgm"
60+
make PG_CONFIG=$HOME/pg17/bin/pg_config installcheck EXTRA_TESTS="pgvector fuzzystrmatch pg_trgm"
5661
continue-on-error: true
5762

5863
- name: Dump regression test errors

.github/workflows/jdbc-driver.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: JDBC Driver Tests
22

33
on:
44
push:
5-
branches: [ "master" ]
5+
branches: [ "PG17_prepare" ]
66

77
pull_request:
8-
branches: [ "master" ]
8+
branches: [ "PG17_prepare" ]
99

1010
jobs:
1111
build:

.github/workflows/nodejs-driver.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Nodejs Driver Tests
22

33
on:
44
push:
5-
branches: [ "master" ]
5+
branches: [ "PG17_prepare" ]
66

77
pull_request:
8-
branches: [ "master" ]
8+
branches: [ "PG17_prepare" ]
99

1010
jobs:
1111
build:

.github/workflows/python-driver.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Python Driver Tests
22

33
on:
44
push:
5-
branches: [ "master" ]
5+
branches: [ "PG17_prepare" ]
66

77
pull_request:
8-
branches: [ "master" ]
8+
branches: [ "PG17_prepare" ]
99

1010
jobs:
1111
build:

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<img src="https://img.shields.io/badge/Release-v1.5.0-FFA500?labelColor=gray&style=flat&link=https://github.com/apache/age/releases"/>
3434
</a>
3535
&nbsp;
36-
<a href="https://www.postgresql.org/docs/16/index.html">
37-
<img src="https://img.shields.io/badge/Version-Postgresql 16-00008B?labelColor=gray&style=flat&link=https://www.postgresql.org/docs/16/index.html"/>
36+
<a href="https://www.postgresql.org/docs/17/index.html">
37+
<img src="https://img.shields.io/badge/Version-Postgresql 17-00008B?labelColor=gray&style=flat&link=https://www.postgresql.org/docs/17/index.html"/>
3838
</a>
3939
&nbsp;
4040
<a href="https://github.com/apache/age/issues">
@@ -125,7 +125,7 @@ Apache AGE is intended to be simple to install and run. It can be installed with
125125
&nbsp;Install PostgreSQL
126126
</h4>
127127

128-
You will need to install an AGE compatible version of Postgres<a>, for now AGE supports Postgres 11, 12, 13, 14, 15 & 16. Supporting the latest versions is on AGE roadmap.
128+
You will need to install an AGE compatible version of Postgres<a>, for now AGE supports Postgres 11, 12, 13, 14, 15, 16 & 17. Supporting the latest versions is on AGE roadmap.
129129

130130
<h4>
131131
&nbsp;Installation via Package Manager
@@ -143,7 +143,7 @@ sudo apt install postgresql
143143
&nbsp;Installation From Source Code
144144
</h4>
145145

146-
You can <a href="https://www.postgresql.org/ftp/source/"> download the Postgres </a> source code and install your own instance of Postgres. You can read instructions on how to install from source code for different versions on the <a href="https://www.postgresql.org/docs/16/installation.html">official Postgres Website.</a>
146+
You can <a href="https://www.postgresql.org/ftp/source/"> download the Postgres </a> source code and install your own instance of Postgres. You can read instructions on how to install from source code for different versions on the <a href="https://www.postgresql.org/docs/17/installation.html">official Postgres Website.</a>
147147

148148

149149

@@ -152,7 +152,7 @@ You can <a href="https://www.postgresql.org/ftp/source/"> download the Postgres
152152

153153
Clone the <a href="https://github.com/apache/age">github repository</a> or download the <a href="https://github.com/apache/age/releases">download an official release.
154154
</a>
155-
Run the pg_config utility and check the version of PostgreSQL. Currently, only PostgreSQL versions 11, 12, 13, 14, 15 & 16 are supported. If you have any other version of Postgres, you will need to install PostgreSQL version 11, 12, 13, 14, 15, or 16.
155+
Run the pg_config utility and check the version of PostgreSQL. Currently, only PostgreSQL versions 11, 12, 13, 14, 15, 16 & 17 are supported. If you have any other version of Postgres, you will need to install PostgreSQL version 11, 12, 13, 14, 15, 16 & 17.
156156
<br>
157157

158158
```bash

docker/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
#
1818

1919
# Build stage: Install necessary development tools for compilation and installation
20-
FROM postgres:16 AS build
20+
FROM postgres:17 AS build
2121

2222
RUN apt-get update \
2323
&& apt-get install -y --no-install-recommends --no-install-suggests \
2424
bison \
2525
build-essential \
2626
flex \
27-
postgresql-server-dev-16
27+
postgresql-server-dev-17
2828

2929
COPY . /age
3030

@@ -34,7 +34,7 @@ RUN make && make install
3434

3535

3636
# Final stage: Create a final image by copying the files created in the build stage
37-
FROM postgres:16
37+
FROM postgres:17
3838

3939
RUN apt-get update \
4040
&& apt-get install -y --no-install-recommends --no-install-suggests \
@@ -48,9 +48,9 @@ ENV LANG=en_US.UTF-8
4848
ENV LC_COLLATE=en_US.UTF-8
4949
ENV LC_CTYPE=en_US.UTF-8
5050

51-
COPY --from=build /usr/lib/postgresql/16/lib/age.so /usr/lib/postgresql/16/lib/
52-
COPY --from=build /usr/share/postgresql/16/extension/age--1.5.0.sql /usr/share/postgresql/16/extension/
53-
COPY --from=build /usr/share/postgresql/16/extension/age.control /usr/share/postgresql/16/extension/
51+
COPY --from=build /usr/lib/postgresql/17/lib/age.so /usr/lib/postgresql/17/lib/
52+
COPY --from=build /usr/share/postgresql/17/extension/age--1.5.0.sql /usr/share/postgresql/17/extension/
53+
COPY --from=build /usr/share/postgresql/17/extension/age.control /usr/share/postgresql/17/extension/
5454
COPY docker/docker-entrypoint-initdb.d/00-create-extension-age.sql /docker-entrypoint-initdb.d/00-create-extension-age.sql
5555

5656
CMD ["postgres", "-c", "shared_preload_libraries=age"]

docker/Dockerfile.dev

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
#
1818

1919

20-
FROM postgres:16
20+
FROM postgres:17
2121

2222
RUN apt-get update
2323
RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests \
2424
bison \
2525
build-essential \
2626
flex \
27-
postgresql-server-dev-16 \
27+
postgresql-server-dev-17 \
2828
locales
2929

3030
ENV LANG=en_US.UTF-8

0 commit comments

Comments
 (0)