Skip to content

Commit deb3d97

Browse files
tomix26tomix26
authored
Merge pull request #85 from zonkyio/upgrade-postgres-versions
Add PostgreSQL 17 to test workflow
2 parents e292489 + 8015ecf commit deb3d97

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jobs:
174174
alpine-lite-arm32v6:
175175
name: Alpine - arm32v6 (Lite)
176176
runs-on: ubuntu-latest
177-
if: ${{ !(startsWith(github.event.milestone.title, '16.')) }}
177+
if: ${{ startsWith(github.event.milestone.title, '10.') || startsWith(github.event.milestone.title, '11.') || startsWith(github.event.milestone.title, '12.') || startsWith(github.event.milestone.title, '13.') || startsWith(github.event.milestone.title, '14.') || startsWith(github.event.milestone.title, '15.') }}
178178
steps:
179179
- name: Checkout code
180180
uses: actions/checkout@v3
@@ -203,7 +203,7 @@ jobs:
203203
alpine-lite-arm64v8:
204204
name: Alpine - arm64v8 (Lite)
205205
runs-on: ubuntu-latest
206-
if: ${{ !(startsWith(github.event.milestone.title, '16.')) }}
206+
if: ${{ startsWith(github.event.milestone.title, '10.') || startsWith(github.event.milestone.title, '11.') || startsWith(github.event.milestone.title, '12.') || startsWith(github.event.milestone.title, '13.') || startsWith(github.event.milestone.title, '14.') || startsWith(github.event.milestone.title, '15.') }}
207207
steps:
208208
- name: Checkout code
209209
uses: actions/checkout@v3
@@ -232,7 +232,7 @@ jobs:
232232
alpine-lite-ppc64le:
233233
name: Alpine - ppc64le (Lite)
234234
runs-on: ubuntu-latest
235-
if: ${{ !(startsWith(github.event.milestone.title, '16.')) }}
235+
if: ${{ startsWith(github.event.milestone.title, '10.') || startsWith(github.event.milestone.title, '11.') || startsWith(github.event.milestone.title, '12.') || startsWith(github.event.milestone.title, '13.') || startsWith(github.event.milestone.title, '14.') || startsWith(github.event.milestone.title, '15.') }}
236236
steps:
237237
- name: Checkout code
238238
uses: actions/checkout@v3
@@ -314,25 +314,25 @@ jobs:
314314
name: ppc64leAlpineBundle
315315
path: alpine-platforms/build/tmp/buildPpc64leAlpineBundle/bundle
316316
- name: Download bundle - arm32v6AlpineLite
317-
if: ${{ !(startsWith(github.event.milestone.title, '16.')) }}
317+
if: ${{ startsWith(github.event.milestone.title, '10.') || startsWith(github.event.milestone.title, '11.') || startsWith(github.event.milestone.title, '12.') || startsWith(github.event.milestone.title, '13.') || startsWith(github.event.milestone.title, '14.') || startsWith(github.event.milestone.title, '15.') }}
318318
uses: actions/download-artifact@v2
319319
with:
320320
name: arm32v6AlpineLiteBundle
321321
path: alpine-lite-platforms/build/tmp/buildArm32v6AlpineLiteBundle/bundle
322322
- name: Download bundle - arm64v8AlpineLite
323-
if: ${{ !(startsWith(github.event.milestone.title, '16.')) }}
323+
if: ${{ startsWith(github.event.milestone.title, '10.') || startsWith(github.event.milestone.title, '11.') || startsWith(github.event.milestone.title, '12.') || startsWith(github.event.milestone.title, '13.') || startsWith(github.event.milestone.title, '14.') || startsWith(github.event.milestone.title, '15.') }}
324324
uses: actions/download-artifact@v2
325325
with:
326326
name: arm64v8AlpineLiteBundle
327327
path: alpine-lite-platforms/build/tmp/buildArm64v8AlpineLiteBundle/bundle
328328
- name: Download bundle - ppc64leAlpineLite
329-
if: ${{ !(startsWith(github.event.milestone.title, '16.')) }}
329+
if: ${{ startsWith(github.event.milestone.title, '10.') || startsWith(github.event.milestone.title, '11.') || startsWith(github.event.milestone.title, '12.') || startsWith(github.event.milestone.title, '13.') || startsWith(github.event.milestone.title, '14.') || startsWith(github.event.milestone.title, '15.') }}
330330
uses: actions/download-artifact@v2
331331
with:
332332
name: ppc64leAlpineLiteBundle
333333
path: alpine-lite-platforms/build/tmp/buildPpc64leAlpineLiteBundle/bundle
334334
- name: Release with Gradle
335-
if: ${{ !(startsWith(github.event.milestone.title, '16.')) }}
335+
if: ${{ startsWith(github.event.milestone.title, '10.') || startsWith(github.event.milestone.title, '11.') || startsWith(github.event.milestone.title, '12.') || startsWith(github.event.milestone.title, '13.') || startsWith(github.event.milestone.title, '14.') || startsWith(github.event.milestone.title, '15.') }}
336336
env:
337337
MAVEN_USER: ${{ secrets.MAVEN_USER }}
338338
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
@@ -355,7 +355,7 @@ jobs:
355355
-Possrh.username=$MAVEN_USER \
356356
-Possrh.password=$MAVEN_PASS
357357
- name: Release with Gradle 2
358-
if: ${{ startsWith(github.event.milestone.title, '16.') }}
358+
if: ${{ !startsWith(github.event.milestone.title, '10.') && !startsWith(github.event.milestone.title, '11.') && !startsWith(github.event.milestone.title, '12.') && !startsWith(github.event.milestone.title, '13.') && !startsWith(github.event.milestone.title, '14.') && !startsWith(github.event.milestone.title, '15.') }}
359359
env:
360360
MAVEN_USER: ${{ secrets.MAVEN_USER }}
361361
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
postgres: ["16.4", "15.8", "14.13", "13.16", "12.20"]
10+
postgres: ["17.0", "16.4", "15.8", "14.13", "13.16", "12.20"]
1111
steps:
1212
- name: Checkout project
1313
uses: actions/checkout@v3
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
postgres: ["16.4", "15.8", "14.13", "13.16", "12.20"]
37+
postgres: ["17.0", "16.4", "15.8", "14.13", "13.16", "12.20"]
3838
steps:
3939
- name: Checkout project
4040
uses: actions/checkout@v3
@@ -47,7 +47,7 @@ jobs:
4747
run: ./gradlew :alpine-platforms:testAmd64AlpineJar -Pversion=${{ matrix.postgres }}-TEST -PpgVersion=${{ matrix.postgres }}
4848
timeout-minutes: 10
4949
- name: Test PostgreSQL bundle (lite)
50-
if: ${{ !(startsWith(matrix.postgres, '9.')) && !(startsWith(matrix.postgres, '16.')) }}
50+
if: ${{ startsWith(matrix.postgres, '10.') || startsWith(matrix.postgres, '11.') || startsWith(matrix.postgres, '12.') || startsWith(matrix.postgres, '13.') || startsWith(matrix.postgres, '14.') || startsWith(matrix.postgres, '15.') }}
5151
run: ./gradlew :alpine-lite-platforms:testAmd64AlpineLiteJar -Pversion=${{ matrix.postgres }}-TEST -PpgVersion=${{ matrix.postgres }}
5252
timeout-minutes: 10
5353
macos:
@@ -56,7 +56,7 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
postgres: ["16.4", "15.8", "14.13", "13.16", "12.20"]
59+
postgres: ["17.0", "16.4", "15.8", "14.13", "13.16", "12.20"]
6060
steps:
6161
- name: Checkout project
6262
uses: actions/checkout@v3
@@ -78,7 +78,7 @@ jobs:
7878
strategy:
7979
fail-fast: false
8080
matrix:
81-
postgres: ["16.4", "15.8", "14.13", "13.16", "12.20"]
81+
postgres: ["17.0", "16.4", "15.8", "14.13", "13.16", "12.20"]
8282
steps:
8383
- name: Checkout project
8484
uses: actions/checkout@v3

‎scripts/build-postgres-alpine.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ $DOCKER_OPTS $IMG_NAME /bin/sh -ex -c 'echo "Starting building postgres binaries
6262
python3-dev \
6363
tcl-dev \
6464
chrpath \
65+
flex \
66+
bison \
6567
\
6668
&& if [ "$E2FS_ENABLED" = false ]; then \
6769
wget -O uuid.tar.gz "https://www.mirrorservice.org/sites/ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz" \
@@ -100,8 +102,8 @@ $DOCKER_OPTS $IMG_NAME /bin/sh -ex -c 'echo "Starting building postgres binaries
100102
--with-python \
101103
--with-tcl \
102104
--without-readline \
103-
&& make -j$(nproc) world \
104-
&& make install-world \
105+
&& make -j$(nproc) world-bin \
106+
&& make install-world-bin \
105107
&& make -C contrib install \
106108
\
107109
&& if [ -n "$POSTGIS_VERSION" ]; then \

‎scripts/build-postgres-debian.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ $DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting building postgres binari
6060
libperl-dev \
6161
python3-dev \
6262
tcl-dev \
63+
flex \
64+
bison \
6365
\
6466
&& wget -O patchelf.tar.gz "https://nixos.org/releases/patchelf/patchelf-0.9/patchelf-0.9.tar.gz" \
6567
&& mkdir -p /usr/src/patchelf \
@@ -92,8 +94,8 @@ $DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting building postgres binari
9294
--with-python \
9395
--with-tcl \
9496
--without-readline \
95-
&& make -j$(nproc) world \
96-
&& make install-world \
97+
&& make -j$(nproc) world-bin \
98+
&& make install-world-bin \
9799
&& make -C contrib install \
98100
\
99101
&& if [ -n "$POSTGIS_VERSION" ]; then \

0 commit comments

Comments
 (0)