From a0695eb28dac009cfdf2efe5b642de714d9778b7 Mon Sep 17 00:00:00 2001
From: Nursultan Yerkenov <nursultan.yerkenov@netcracker.com>
Date: Tue, 18 Nov 2025 14:15:31 +0500
Subject: [PATCH 1/2] Feat: [CPCAP-4636] support to pg18

---
 .github/workflows/build.yaml | 4 ++++
 .github/workflows/clean.yaml | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 127c99e..86a27ac 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -23,6 +23,10 @@ jobs:
       fail-fast: false
       matrix:
         component:
+          - name: pgskipper-patroni-18
+            file: Dockerfile
+            context: ""
+            pg_version: "18"
           - name: pgskipper-patroni-17
             file: Dockerfile
             context: ""
diff --git a/.github/workflows/clean.yaml b/.github/workflows/clean.yaml
index 457ecce..87b29ea 100644
--- a/.github/workflows/clean.yaml
+++ b/.github/workflows/clean.yaml
@@ -12,6 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         component:
+          - name: pgskipper-patroni-18
+            context: ""
           - name: pgskipper-patroni-17
             context: ""
           - name: pgskipper-patroni-16

From 7f2483d906a47dfe90be4725b3773323e7713e71 Mon Sep 17 00:00:00 2001
From: Nursultan Yerkenov <nursultan.yerkenov@netcracker.com>
Date: Fri, 28 Nov 2025 15:00:41 +0500
Subject: [PATCH 2/2] Fix: skip pg_dbms_stats for PG18

---
 Dockerfile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1c7a3d1..034148c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -111,11 +111,17 @@ RUN apt update && apt-get install -y git make gcc && \
     cd pgsentinel && \
     git checkout 0218c2147daab0d2dbbf08433cb480163d321839 && \
     cd src && make install && \
-    cd ../.. && git clone --depth 1 --branch REL14_0 https://github.com/ossc-db/pg_dbms_stats.git && \
-    cd pg_dbms_stats && sed -i 's/$(MAJORVERSION)/14/g' Makefile && \
-    make install && \
+    cd ../.. && \
+    if [ "$PG_VERSION" -lt 18 ]; then \
+        git clone --depth 1 --branch REL14_0 https://github.com/ossc-db/pg_dbms_stats.git && \
+        cd pg_dbms_stats && sed -i 's/$(MAJORVERSION)/14/g' Makefile && \
+        make install && \
+        cd .. ; \
+    else \
+        echo "Skipping pg_dbms_stats: not supported on PostgreSQL $PG_VERSION"; \
+    fi && \
     apt-get purge -y --auto-remove git make gcc && \
-    cd .. && rm -rf pgsentinel
+    rm -rf pgsentinel
 
 RUN apt-get install -y alien vmtouch openssh-server