From bdd3ff085d30cf3025c27357cdba6c8523982f21 Mon Sep 17 00:00:00 2001 From: naisila Date: Wed, 12 Mar 2025 16:35:05 +0300 Subject: [PATCH 1/3] Try to bump PG versions --- .devcontainer/Dockerfile | 8 ++++---- .github/workflows/build_and_test.yml | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index dac40c5e1..b4479c94c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -73,7 +73,7 @@ USER citus # build postgres versions separately for effective parrallelism and caching of already built versions when changing only certain versions FROM base AS pg15 -RUN MAKEFLAGS="-j $(nproc)" pgenv build 15.10 +RUN MAKEFLAGS="-j $(nproc)" pgenv build 15.12 RUN rm .pgenv/src/*.tar* RUN make -C .pgenv/src/postgresql-*/ clean RUN make -C .pgenv/src/postgresql-*/src/include install @@ -85,7 +85,7 @@ RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/ RUN rm .pgenv-staging/config/default.conf FROM base AS pg16 -RUN MAKEFLAGS="-j $(nproc)" pgenv build 16.6 +RUN MAKEFLAGS="-j $(nproc)" pgenv build 16.8 RUN rm .pgenv/src/*.tar* RUN make -C .pgenv/src/postgresql-*/ clean RUN make -C .pgenv/src/postgresql-*/src/include install @@ -97,7 +97,7 @@ RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/ RUN rm .pgenv-staging/config/default.conf FROM base AS pg17 -RUN MAKEFLAGS="-j $(nproc)" pgenv build 17.2 +RUN MAKEFLAGS="-j $(nproc)" pgenv build 17.4 RUN rm .pgenv/src/*.tar* RUN make -C .pgenv/src/postgresql-*/ clean RUN make -C .pgenv/src/postgresql-*/src/include install @@ -216,7 +216,7 @@ COPY --chown=citus:citus .psqlrc . RUN sudo chown --from=root:root citus:citus -R ~ # sets default pg version -RUN pgenv switch 17.2 +RUN pgenv switch 17.4 # 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 bf6c41eaf..b1ffb76f9 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -31,13 +31,13 @@ jobs: pgupgrade_image_name: "ghcr.io/citusdata/pgupgradetester" style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" - sql_snapshot_pg_version: "17.2" - image_suffix: "-v889e4c1" - image_suffix_citus_upgrade: "-dev-2ad1f90" - pg15_version: '{ "major": "15", "full": "15.10" }' - pg16_version: '{ "major": "16", "full": "16.6" }' - pg17_version: '{ "major": "17", "full": "17.2" }' - upgrade_pg_versions: "14.15-15.10-16.6-17.2" + sql_snapshot_pg_version: "17.4" + image_suffix: "-dev-660aa7a" + image_suffix_citus_upgrade: "-dev-660aa7a" + pg15_version: '{ "major": "15", "full": "15.12" }' + pg16_version: '{ "major": "16", "full": "16.8" }' + pg17_version: '{ "major": "17", "full": "17.4" }' + upgrade_pg_versions: "15.12-16.8-17.4" steps: # Since GHA jobs need at least one step we use a noop step here. - name: Set up parameters From 6b2f1139470ab69c96a33efbf21033e43775a50e Mon Sep 17 00:00:00 2001 From: naisila Date: Fri, 14 Mar 2025 14:28:34 +0300 Subject: [PATCH 2/3] Try locally built images --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index b1ffb76f9..ce901553c 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,8 +32,8 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "17.4" - image_suffix: "-dev-660aa7a" - image_suffix_citus_upgrade: "-dev-660aa7a" + image_suffix: "-dev-eab367a" + image_suffix_citus_upgrade: "-dev-eab367a" pg15_version: '{ "major": "15", "full": "15.12" }' pg16_version: '{ "major": "16", "full": "16.8" }' pg17_version: '{ "major": "17", "full": "17.4" }' From 1d947f07346dc6d67571e903e6f5dee9d0b6b223 Mon Sep 17 00:00:00 2001 From: naisila Date: Fri, 14 Mar 2025 14:43:01 +0300 Subject: [PATCH 3/3] Change commit sha --- .github/workflows/build_and_test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index ce901553c..d294341a2 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,8 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "17.4" - image_suffix: "-dev-eab367a" - image_suffix_citus_upgrade: "-dev-eab367a" + image_suffix: "-veab367a" pg15_version: '{ "major": "15", "full": "15.12" }' pg16_version: '{ "major": "16", "full": "16.8" }' pg17_version: '{ "major": "17", "full": "17.4" }' @@ -353,7 +352,7 @@ jobs: name: PG${{ fromJson(needs.params.outputs.pg15_version).major }} - check-citus-upgrade runs-on: ubuntu-20.04 container: - image: "${{ needs.params.outputs.citusupgrade_image_name }}:${{ fromJson(needs.params.outputs.pg15_version).full }}${{ needs.params.outputs.image_suffix_citus_upgrade }}" + image: "${{ needs.params.outputs.citusupgrade_image_name }}:${{ fromJson(needs.params.outputs.pg15_version).full }}${{ needs.params.outputs.image_suffix }}" options: --user root needs: - params