From be923cb422d5f257fe483813257af09b109a70ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Van=C4=9Bk?= <tomix26@gmail.com>
Date: Wed, 21 May 2025 11:47:15 +0200
Subject: [PATCH] add postgres 18 to test workflow

---
 .github/workflows/test.yml       | 8 ++++----
 build.gradle                     | 6 +++---
 scripts/build-postgres-alpine.sh | 2 +-
 scripts/repack-postgres.sh       | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c3c2e1c7..f438ff72 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgres: ["17.6", "16.10", "15.14", "14.19", "13.22"]
+        postgres: ["18.0", "17.6", "16.10", "15.14", "14.19", "13.22"]
     steps:
       - name: Checkout project
         uses: actions/checkout@v3
@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgres: ["17.6", "16.10", "15.14", "14.19", "13.22"]
+        postgres: ["18.0", "17.6", "16.10", "15.14", "14.19", "13.22"]
     steps:
       - name: Checkout project
         uses: actions/checkout@v3
@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgres: ["17.6", "16.10", "15.14", "14.19", "13.22"]
+        postgres: ["18.0", "17.6", "16.10", "15.14", "14.19", "13.22"]
     steps:
       - name: Checkout project
         uses: actions/checkout@v3
@@ -78,7 +78,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        postgres: ["17.6", "16.10", "15.14", "14.19", "13.22"]
+        postgres: ["18.0", "17.6", "16.10", "15.14", "14.19", "13.22"]
     steps:
       - name: Checkout project
         uses: actions/checkout@v3
diff --git a/build.gradle b/build.gradle
index a6d5028d..0b0897ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -602,12 +602,12 @@ static def defaultAlpineImage(archName, useEmulation) {
     def system = OperatingSystem.current()
 
     if (archName == system.getArch()) {
-        return 'alpine:3.6'
+        return 'alpine:3.9'
     } else if (system.isMacOsX() || useEmulation) {
-        return "$archName/alpine:3.6"
+        return "$archName/alpine:3.9"
     } else if (system.isLinux()) {
         def archMappings = ['arm32v5':'armel', 'arm32v6':'armhf', 'arm64v8':'arm64']
-        return "multiarch/alpine:${archMappings[archName] ?: archName}-v3.6"
+        return "multiarch/alpine:${archMappings[archName] ?: archName}-v3.9"
     } else {
         throw new GradleException("Cross-building is not supported on the current platform: $system")
     }
diff --git a/scripts/build-postgres-alpine.sh b/scripts/build-postgres-alpine.sh
index 13e62dc7..544c9430 100755
--- a/scripts/build-postgres-alpine.sh
+++ b/scripts/build-postgres-alpine.sh
@@ -150,7 +150,7 @@ $DOCKER_OPTS $IMG_NAME /bin/sh -ex -c 'echo "Starting building postgres binaries
     ; fi \
     \
     && cd /usr/local/pg-build \
-    && 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 \
+    && 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 \
     && 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 \
     && if [ -n "$POSTGIS_VERSION" ]; then cp --no-dereference /usr/lib/libjson-c.so* /usr/lib/libsqlite3.so* ./lib ; fi \
     && find ./bin -type f \( -name "initdb" -o -name "pg_ctl" -o -name "postgres" \) -print0 | xargs -0 -n1 chrpath -r "\$ORIGIN/../lib" \
diff --git a/scripts/repack-postgres.sh b/scripts/repack-postgres.sh
index 763b399c..f227818d 100755
--- a/scripts/repack-postgres.sh
+++ b/scripts/repack-postgres.sh
@@ -113,7 +113,7 @@ elif [ "$PLATFORM_NAME" = "windows" ] ; then
 
   tar -cJvf $TRG_DIR/postgres-windows-$NORM_ARCH_NAME.txz \
     share \
-    lib/iconv.lib \
+    $([ -f lib/libiconv.lib ] && echo lib/libiconv.lib || echo lib/iconv.lib) \
     lib/libxml2.lib \
     $([ -f lib/ssleay32.lib ] && echo lib/ssleay32.lib lib/ssleay32MD.lib || echo lib/libssl.lib lib/libcrypto.lib) \
     lib/*.dll \