Skip to content

Commit 4d59ab1

Browse files
committed
add postgres 18 to test workflow
1 parent 348f869 commit 4d59ab1

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
postgres: ["17.6", "16.10", "15.14", "14.19", "13.22"]
10+
postgres: ["18.0", "17.6", "16.10", "15.14", "14.19", "13.22"]
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: ["17.6", "16.10", "15.14", "14.19", "13.22"]
37+
postgres: ["18.0", "17.6", "16.10", "15.14", "14.19", "13.22"]
3838
steps:
3939
- name: Checkout project
4040
uses: actions/checkout@v3
@@ -56,7 +56,7 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
postgres: ["17.6", "16.10", "15.14", "14.19", "13.22"]
59+
postgres: ["18.0", "17.6", "16.10", "15.14", "14.19", "13.22"]
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: ["17.6", "16.10", "15.14", "14.19", "13.22"]
81+
postgres: ["18.0", "17.6", "16.10", "15.14", "14.19", "13.22"]
8282
steps:
8383
- name: Checkout project
8484
uses: actions/checkout@v3

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -602,12 +602,12 @@ static def defaultAlpineImage(archName, useEmulation) {
602602
def system = OperatingSystem.current()
603603

604604
if (archName == system.getArch()) {
605-
return 'alpine:3.6'
605+
return 'alpine:3.9'
606606
} else if (system.isMacOsX() || useEmulation) {
607-
return "$archName/alpine:3.6"
607+
return "$archName/alpine:3.9"
608608
} else if (system.isLinux()) {
609609
def archMappings = ['arm32v5':'armel', 'arm32v6':'armhf', 'arm64v8':'arm64']
610-
return "multiarch/alpine:${archMappings[archName] ?: archName}-v3.6"
610+
return "multiarch/alpine:${archMappings[archName] ?: archName}-v3.9"
611611
} else {
612612
throw new GradleException("Cross-building is not supported on the current platform: $system")
613613
}

scripts/build-postgres-alpine.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ $DOCKER_OPTS $IMG_NAME /bin/sh -ex -c 'echo "Starting building postgres binaries
150150
; fi \
151151
\
152152
&& cd /usr/local/pg-build \
153-
&& cp /lib/libuuid.so.1 /lib/libz.so.1 /lib/libssl.so.1.0.0 /lib/libcrypto.so.1.0.0 /usr/lib/libxml2.so.2 /usr/lib/libxslt.so.1 ./lib \
153+
&& cp /lib/libuuid.so.1 /lib/libz.so.1 /lib/libssl.so.1.1 /lib/libcrypto.so.1.1 /usr/lib/libxml2.so.2 /usr/lib/libxslt.so.1 ./lib \
154154
&& if [ "$ICU_ENABLED" = true ]; then cp --no-dereference /usr/lib/libicudata.so* /usr/lib/libicuuc.so* /usr/lib/libicui18n.so* /usr/lib/libstdc++.so* /usr/lib/libgcc_s.so* ./lib; fi \
155155
&& if [ -n "$POSTGIS_VERSION" ]; then cp --no-dereference /usr/lib/libjson-c.so* /usr/lib/libsqlite3.so* ./lib ; fi \
156156
&& find ./bin -type f \( -name "initdb" -o -name "pg_ctl" -o -name "postgres" \) -print0 | xargs -0 -n1 chrpath -r "\$ORIGIN/../lib" \

0 commit comments

Comments
 (0)