From a1be689711dd4b07346df1f9e1604250ef58152a Mon Sep 17 00:00:00 2001
From: Mehmet Yilmaz <mehmetyilmaz@microsoft.com>
Date: Thu, 2 Oct 2025 10:46:59 +0000
Subject: [PATCH] add pg 18.0

---
 .devcontainer/Dockerfile             | 4 ++--
 .github/workflows/build_and_test.yml | 6 +++---
 citus-tools                          | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 160000 citus-tools

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 9afc9f40c..02b06adcb 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -109,7 +109,7 @@ RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
 RUN rm .pgenv-staging/config/default.conf
 
 FROM base AS pg18
-RUN MAKEFLAGS="-j $(nproc)" pgenv build 18rc1
+RUN MAKEFLAGS="-j $(nproc)" pgenv build 18.0
 RUN rm .pgenv/src/*.tar*
 RUN make -C .pgenv/src/postgresql-*/ clean
 RUN make -C .pgenv/src/postgresql-*/src/include install
@@ -229,7 +229,7 @@ COPY --chown=citus:citus .psqlrc .
 RUN sudo chown --from=root:root citus:citus -R ~
 
 # sets default pg version
-RUN pgenv switch 18rc1
+RUN pgenv switch 18.0
 
 # make connecting to the coordinator easy
 ENV PGPORT=9700
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 986d6b3d7..4dde6ae2a 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -32,12 +32,12 @@ jobs:
       style_checker_image_name: "ghcr.io/citusdata/stylechecker"
       style_checker_tools_version: "0.8.18"
       sql_snapshot_pg_version: "17.6"
-      image_suffix: "-dev-4df94a0"
+      image_suffix: "-dev-97072ce"
       pg15_version: '{ "major": "15", "full": "15.14" }'
       pg16_version: '{ "major": "16", "full": "16.10" }'
       pg17_version: '{ "major": "17", "full": "17.6" }'
-      pg18_version: '{ "major": "18", "full": "18rc1" }'
-      upgrade_pg_versions: "15.14-16.10-17.6-18rc1"
+      pg18_version: '{ "major": "18", "full": "18.0" }'
+      upgrade_pg_versions: "15.14-16.10-17.6-18.0"
     steps:
       # Since GHA jobs need at least one step we use a noop step here.
       - name: Set up parameters
diff --git a/citus-tools b/citus-tools
new file mode 160000
index 000000000..3376bd684
--- /dev/null
+++ b/citus-tools
@@ -0,0 +1 @@
+Subproject commit 3376bd6845f0614908ed304f5033bd644c82d3bf