From 129dde21761a251caa4d52d170401e97eb17e792 Mon Sep 17 00:00:00 2001 From: Mehmet Yilmaz Date: Thu, 11 Sep 2025 10:49:50 +0000 Subject: [PATCH] Update Dockerfile and CI workflow to use PostgreSQL 18rc1 --- .devcontainer/Dockerfile | 4 ++-- .github/workflows/build_and_test.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 54b2df65e..9afc9f40c 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 18beta3 +RUN MAKEFLAGS="-j $(nproc)" pgenv build 18rc1 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 18beta3 +RUN pgenv switch 18rc1 # 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 3e1ea4db7..99114ecb4 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.5" - image_suffix: "-dev-8e2a1ce" + image_suffix: "-dev-4df94a0" pg15_version: '{ "major": "15", "full": "15.13" }' pg16_version: '{ "major": "16", "full": "16.9" }' pg17_version: '{ "major": "17", "full": "17.5" }' - pg18_version: '{ "major": "18", "full": "18beta3" }' - upgrade_pg_versions: "15.13-16.9-17.5-18beta3" + pg18_version: '{ "major": "18", "full": "18rc1" }' + upgrade_pg_versions: "15.13-16.9-17.5-18rc1" steps: # Since GHA jobs need at least one step we use a noop step here. - name: Set up parameters