From 74e2117c2b33303629d5b56a9795d9ad7609897e Mon Sep 17 00:00:00 2001 From: naisila Date: Thu, 2 Jan 2025 12:20:04 +0300 Subject: [PATCH 01/23] Bump pg versions --- .devcontainer/Dockerfile | 8 ++++---- .github/workflows/build_and_test.yml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 7dc75abd437..9c0b011f0d3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -68,7 +68,7 @@ USER citus # build postgres versions separately for effective parrallelism and caching of already built versions when changing only certain versions FROM base AS pg14 -RUN MAKEFLAGS="-j $(nproc)" pgenv build 14.14 +RUN MAKEFLAGS="-j $(nproc)" pgenv build 14.15 RUN rm .pgenv/src/*.tar* RUN make -C .pgenv/src/postgresql-*/ clean RUN make -C .pgenv/src/postgresql-*/src/include install @@ -80,7 +80,7 @@ RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/ RUN rm .pgenv-staging/config/default.conf FROM base AS pg15 -RUN MAKEFLAGS="-j $(nproc)" pgenv build 15.9 +RUN MAKEFLAGS="-j $(nproc)" pgenv build 15.10 RUN rm .pgenv/src/*.tar* RUN make -C .pgenv/src/postgresql-*/ clean RUN make -C .pgenv/src/postgresql-*/src/include install @@ -92,7 +92,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.5 +RUN MAKEFLAGS="-j $(nproc)" pgenv build 16.6 RUN rm .pgenv/src/*.tar* RUN make -C .pgenv/src/postgresql-*/ clean RUN make -C .pgenv/src/postgresql-*/src/include install @@ -211,7 +211,7 @@ COPY --chown=citus:citus .psqlrc . RUN sudo chown --from=root:root citus:citus -R ~ # sets default pg version -RUN pgenv switch 16.5 +RUN pgenv switch 16.6 # 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 ffeea30944b..326f10ca0bf 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -31,12 +31,12 @@ 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: "16.5" - image_suffix: "-v1d9d7d7" - pg14_version: '{ "major": "14", "full": "14.14" }' - pg15_version: '{ "major": "15", "full": "15.9" }' - pg16_version: '{ "major": "16", "full": "16.5" }' - upgrade_pg_versions: "14.14-15.9-16.5" + sql_snapshot_pg_version: "16.6" + image_suffix: "-dev-e142363" + pg14_version: '{ "major": "14", "full": "14.15" }' + pg15_version: '{ "major": "15", "full": "15.10" }' + pg16_version: '{ "major": "16", "full": "16.6" }' + upgrade_pg_versions: "14.15-15.10-16.6" steps: # Since GHA jobs need at least one step we use a noop step here. - name: Set up parameters From a80ec7afc46797f99b916a0c0264c9e4b26e548c Mon Sep 17 00:00:00 2001 From: naisila Date: Thu, 2 Jan 2025 15:00:01 +0300 Subject: [PATCH 02/23] try --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 326f10ca0bf..8d49f0e1fa4 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-e142363" + image_suffix: "-dev-94f4e5a" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' From c477058d370ccabffaf5869443e641ebac1df2e6 Mon Sep 17 00:00:00 2001 From: naisila Date: Thu, 2 Jan 2025 16:53:43 +0300 Subject: [PATCH 03/23] try --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 8d49f0e1fa4..0b0ae8c49b5 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-94f4e5a" + image_suffix: "-dev-20e585f" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' From 5b33a4ba24715f3a0e934787b5a635df03b6763a Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 3 Jan 2025 15:59:30 +0300 Subject: [PATCH 04/23] revert last two commits --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 0b0ae8c49b5..326f10ca0bf 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-20e585f" + image_suffix: "-dev-e142363" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' From d9afc1f1e0a1557344b8217215ade106bb077047 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 3 Jan 2025 16:00:30 +0300 Subject: [PATCH 05/23] use 8b26747 from https://github.com/citusdata/the-process/tree/upgrade-try, only fixes exttester --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 326f10ca0bf..6b8fa01f954 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-e142363" + image_suffix: "-dev-8b26747" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' From f9a78b8f22eff352655434c654e44474c00cee6b Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 3 Jan 2025 17:17:42 +0300 Subject: [PATCH 06/23] try one more time --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 6b8fa01f954..4ec48ccbcc1 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-8b26747" + image_suffix: "-dev-278c385" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' From 18bc056f10aad0731615c3d3e210883311f15e72 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 3 Jan 2025 17:43:22 +0300 Subject: [PATCH 07/23] try --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 4ec48ccbcc1..a0ceae50e44 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-278c385" + image_suffix: "-dev-8c38fe2" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' From 9ed7ec3a67bd45e3355cc6d913d1b460a187a21f Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Tue, 7 Jan 2025 15:08:28 +0300 Subject: [PATCH 08/23] Update image suffix --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index a0ceae50e44..8327cddc203 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-8c38fe2" + image_suffix: "-dev-c31f6f8" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' From 4c842b9a1868840b778e8297bac0a88237b2d1dc Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Tue, 7 Jan 2025 15:10:34 +0300 Subject: [PATCH 09/23] Run tests unconditionally for testing purposes --- .github/workflows/build_and_test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 8327cddc203..11d111b444c 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -11,9 +11,6 @@ on: default: false type: boolean push: - branches: - - "main" - - "release-*" pull_request: types: [opened, reopened,synchronize] merge_group: From b49035882f8c90d9393029659e34531e8004ce79 Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Tue, 7 Jan 2025 15:16:00 +0300 Subject: [PATCH 10/23] Revert "Run tests unconditionally for testing purposes" This reverts commit 4c842b9a1868840b778e8297bac0a88237b2d1dc. --- .github/workflows/build_and_test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 11d111b444c..8327cddc203 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -11,6 +11,9 @@ on: default: false type: boolean push: + branches: + - "main" + - "release-*" pull_request: types: [opened, reopened,synchronize] merge_group: From 2c1fe6ff2f0cefdfa70ceefd7710a16d2168c732 Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Tue, 7 Jan 2025 15:43:01 +0300 Subject: [PATCH 11/23] disable code coverage --- .github/workflows/build_and_test.yml | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 8327cddc203..107159aa561 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -237,11 +237,11 @@ jobs: if: always() with: folder: ${{ fromJson(matrix.pg_version).major }}_${{ matrix.make }} - - uses: "./.github/actions/upload_coverage" - if: always() - with: - flags: ${{ env.PG_MAJOR }}_${{ matrix.suite }}_${{ matrix.make }} - codecov_token: ${{ secrets.CODECOV_TOKEN }} + # - uses: "./.github/actions/upload_coverage" + # if: always() + # with: + # flags: ${{ env.PG_MAJOR }}_${{ matrix.suite }}_${{ matrix.make }} + # codecov_token: ${{ secrets.CODECOV_TOKEN }} test-arbitrary-configs: name: PG${{ fromJson(matrix.pg_version).major }} - check-arbitrary-configs-${{ matrix.parallel }} runs-on: ["self-hosted", "1ES.Pool=1es-gha-citusdata-pool"] @@ -284,11 +284,11 @@ jobs: check-arbitrary-configs parallel=4 CONFIGS=$TESTS - uses: "./.github/actions/save_logs_and_results" if: always() - - uses: "./.github/actions/upload_coverage" - if: always() - with: - flags: ${{ env.pg_major }}_upgrade - codecov_token: ${{ secrets.CODECOV_TOKEN }} + # - uses: "./.github/actions/upload_coverage" + # if: always() + # with: + # flags: ${{ env.pg_major }}_upgrade + # codecov_token: ${{ secrets.CODECOV_TOKEN }} test-pg-upgrade: name: PG${{ matrix.old_pg_major }}-PG${{ matrix.new_pg_major }} - check-pg-upgrade runs-on: ubuntu-20.04 @@ -335,11 +335,11 @@ jobs: if: failure() - uses: "./.github/actions/save_logs_and_results" if: always() - - uses: "./.github/actions/upload_coverage" - if: always() - with: - flags: ${{ env.old_pg_major }}_${{ env.new_pg_major }}_upgrade - codecov_token: ${{ secrets.CODECOV_TOKEN }} + # - uses: "./.github/actions/upload_coverage" + # if: always() + # with: + # flags: ${{ env.old_pg_major }}_${{ env.new_pg_major }}_upgrade + # codecov_token: ${{ secrets.CODECOV_TOKEN }} test-citus-upgrade: name: PG${{ fromJson(needs.params.outputs.pg14_version).major }} - check-citus-upgrade runs-on: ubuntu-20.04 @@ -380,11 +380,11 @@ jobs: done; - uses: "./.github/actions/save_logs_and_results" if: always() - - uses: "./.github/actions/upload_coverage" - if: always() - with: - flags: ${{ env.pg_major }}_upgrade - codecov_token: ${{ secrets.CODECOV_TOKEN }} + # - uses: "./.github/actions/upload_coverage" + # if: always() + # with: + # flags: ${{ env.pg_major }}_upgrade + # codecov_token: ${{ secrets.CODECOV_TOKEN }} upload-coverage: if: always() env: From 5281225ddf5e1b402c75f01906113c40d2958d3b Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Tue, 7 Jan 2025 13:09:08 +0000 Subject: [PATCH 12/23] Revert "disable code coverage" This reverts commit 2c1fe6ff2f0cefdfa70ceefd7710a16d2168c732. --- .github/workflows/build_and_test.yml | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 107159aa561..8327cddc203 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -237,11 +237,11 @@ jobs: if: always() with: folder: ${{ fromJson(matrix.pg_version).major }}_${{ matrix.make }} - # - uses: "./.github/actions/upload_coverage" - # if: always() - # with: - # flags: ${{ env.PG_MAJOR }}_${{ matrix.suite }}_${{ matrix.make }} - # codecov_token: ${{ secrets.CODECOV_TOKEN }} + - uses: "./.github/actions/upload_coverage" + if: always() + with: + flags: ${{ env.PG_MAJOR }}_${{ matrix.suite }}_${{ matrix.make }} + codecov_token: ${{ secrets.CODECOV_TOKEN }} test-arbitrary-configs: name: PG${{ fromJson(matrix.pg_version).major }} - check-arbitrary-configs-${{ matrix.parallel }} runs-on: ["self-hosted", "1ES.Pool=1es-gha-citusdata-pool"] @@ -284,11 +284,11 @@ jobs: check-arbitrary-configs parallel=4 CONFIGS=$TESTS - uses: "./.github/actions/save_logs_and_results" if: always() - # - uses: "./.github/actions/upload_coverage" - # if: always() - # with: - # flags: ${{ env.pg_major }}_upgrade - # codecov_token: ${{ secrets.CODECOV_TOKEN }} + - uses: "./.github/actions/upload_coverage" + if: always() + with: + flags: ${{ env.pg_major }}_upgrade + codecov_token: ${{ secrets.CODECOV_TOKEN }} test-pg-upgrade: name: PG${{ matrix.old_pg_major }}-PG${{ matrix.new_pg_major }} - check-pg-upgrade runs-on: ubuntu-20.04 @@ -335,11 +335,11 @@ jobs: if: failure() - uses: "./.github/actions/save_logs_and_results" if: always() - # - uses: "./.github/actions/upload_coverage" - # if: always() - # with: - # flags: ${{ env.old_pg_major }}_${{ env.new_pg_major }}_upgrade - # codecov_token: ${{ secrets.CODECOV_TOKEN }} + - uses: "./.github/actions/upload_coverage" + if: always() + with: + flags: ${{ env.old_pg_major }}_${{ env.new_pg_major }}_upgrade + codecov_token: ${{ secrets.CODECOV_TOKEN }} test-citus-upgrade: name: PG${{ fromJson(needs.params.outputs.pg14_version).major }} - check-citus-upgrade runs-on: ubuntu-20.04 @@ -380,11 +380,11 @@ jobs: done; - uses: "./.github/actions/save_logs_and_results" if: always() - # - uses: "./.github/actions/upload_coverage" - # if: always() - # with: - # flags: ${{ env.pg_major }}_upgrade - # codecov_token: ${{ secrets.CODECOV_TOKEN }} + - uses: "./.github/actions/upload_coverage" + if: always() + with: + flags: ${{ env.pg_major }}_upgrade + codecov_token: ${{ secrets.CODECOV_TOKEN }} upload-coverage: if: always() env: From a7ec6f726fd6959848fdbb6b8c27b4e5a3a274d5 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Tue, 7 Jan 2025 13:10:06 +0000 Subject: [PATCH 13/23] remove codeclimate --- .github/actions/upload_coverage/action.yml | 12 ------------ .github/workflows/build_and_test.yml | 22 ---------------------- 2 files changed, 34 deletions(-) diff --git a/.github/actions/upload_coverage/action.yml b/.github/actions/upload_coverage/action.yml index 0b5f581a6a4..784cb2a7654 100644 --- a/.github/actions/upload_coverage/action.yml +++ b/.github/actions/upload_coverage/action.yml @@ -13,15 +13,3 @@ runs: token: ${{ inputs.codecov_token }} verbose: true gcov: true - - name: Create codeclimate coverage - run: |- - lcov --directory . --capture --output-file lcov.info - lcov --remove lcov.info -o lcov.info '/usr/*' - sed "s=^SF:$PWD/=SF:=g" -i lcov.info # relative pats are required by codeclimate - mkdir -p /tmp/codeclimate - cc-test-reporter format-coverage -t lcov -o /tmp/codeclimate/${{ inputs.flags }}.json lcov.info - shell: bash - - uses: actions/upload-artifact@v3.1.1 - with: - path: "/tmp/codeclimate/*.json" - name: codeclimate diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 8327cddc203..facc8151c6e 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -385,28 +385,6 @@ jobs: with: flags: ${{ env.pg_major }}_upgrade codecov_token: ${{ secrets.CODECOV_TOKEN }} - upload-coverage: - if: always() - env: - CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} - runs-on: ubuntu-20.04 - container: - image: ${{ needs.params.outputs.test_image_name }}:${{ fromJson(needs.params.outputs.pg16_version).full }}${{ needs.params.outputs.image_suffix }} - needs: - - params - - test-citus - - test-arbitrary-configs - - test-citus-upgrade - - test-pg-upgrade - steps: - - uses: actions/download-artifact@v3.0.1 - with: - name: "codeclimate" - path: "codeclimate" - - name: Upload coverage results to Code Climate - run: |- - cc-test-reporter sum-coverage codeclimate/*.json -o total.json - cc-test-reporter upload-coverage -i total.json ch_benchmark: name: CH Benchmark if: startsWith(github.ref, 'refs/heads/ch_benchmark/') From 8fda6620c5a0abd1bb7882691ac144369924a129 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Tue, 7 Jan 2025 13:13:37 +0000 Subject: [PATCH 14/23] bump upgrade image tag --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index facc8151c6e..2c6201b9504 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -36,7 +36,7 @@ jobs: pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' - upgrade_pg_versions: "14.15-15.10-16.6" + upgrade_pg_versions: "14.15-15.10-16.6-17.2" steps: # Since GHA jobs need at least one step we use a noop step here. - name: Set up parameters From 6556e6e81aa9b710bf51d2466293b3b00833e50b Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Tue, 7 Jan 2025 13:36:44 +0000 Subject: [PATCH 15/23] undo pgupgrade test changes to include pg17, since the python scripts don't have valid pg17 references just yet --- .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 2c6201b9504..40c7c19b13b 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,11 +32,11 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-c31f6f8" + image_suffix: "-dev-2070de5" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' - upgrade_pg_versions: "14.15-15.10-16.6-17.2" + upgrade_pg_versions: "14.15-15.10-16.6" steps: # Since GHA jobs need at least one step we use a noop step here. - name: Set up parameters From 00a62728c39a2f6536698d896f9adcef4164597c Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Tue, 7 Jan 2025 14:02:06 +0000 Subject: [PATCH 16/23] ci build bookworm --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 40c7c19b13b..149945bb6a9 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-2070de5" + image_suffix: "-dev-fda4e33" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' From f41a29272fb970e9473e78230a248a07ccdc72ee Mon Sep 17 00:00:00 2001 From: naisila Date: Fri, 10 Jan 2025 14:50:58 +0300 Subject: [PATCH 17/23] Onur's locally built 14.5 exttester image --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 149945bb6a9..d7f796ce3b1 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-fda4e33" + image_suffix: "-dev-889e4c1" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' From 299136da69eda7fc4ee67ddb1762401f5802d13d Mon Sep 17 00:00:00 2001 From: naisila Date: Fri, 10 Jan 2025 16:27:03 +0300 Subject: [PATCH 18/23] Try only pg14, to be reverted --- .github/workflows/build_and_test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index d7f796ce3b1..475a5351e89 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -111,8 +111,6 @@ jobs: - ${{ needs.params.outputs.image_suffix}} pg_version: - ${{ needs.params.outputs.pg14_version }} - - ${{ needs.params.outputs.pg15_version }} - - ${{ needs.params.outputs.pg16_version }} runs-on: ubuntu-20.04 container: image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ matrix.image_suffix }}" From bff2fcf9580b80221e4e8fd0b3a02b17553884be Mon Sep 17 00:00:00 2001 From: naisila Date: Fri, 10 Jan 2025 22:17:03 +0300 Subject: [PATCH 19/23] Revert "Try only pg14, to be reverted" This reverts commit 299136da69eda7fc4ee67ddb1762401f5802d13d. --- .github/workflows/build_and_test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 475a5351e89..d7f796ce3b1 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -111,6 +111,8 @@ jobs: - ${{ needs.params.outputs.image_suffix}} pg_version: - ${{ needs.params.outputs.pg14_version }} + - ${{ needs.params.outputs.pg15_version }} + - ${{ needs.params.outputs.pg16_version }} runs-on: ubuntu-20.04 container: image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ matrix.image_suffix }}" From b2216cd44ccb565e7fd6d72e072c08dc75917cd7 Mon Sep 17 00:00:00 2001 From: naisila Date: Fri, 10 Jan 2025 22:19:00 +0300 Subject: [PATCH 20/23] Revert "remove codeclimate" This reverts commit a7ec6f726fd6959848fdbb6b8c27b4e5a3a274d5. --- .github/actions/upload_coverage/action.yml | 12 ++++++++++++ .github/workflows/build_and_test.yml | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/.github/actions/upload_coverage/action.yml b/.github/actions/upload_coverage/action.yml index 784cb2a7654..0b5f581a6a4 100644 --- a/.github/actions/upload_coverage/action.yml +++ b/.github/actions/upload_coverage/action.yml @@ -13,3 +13,15 @@ runs: token: ${{ inputs.codecov_token }} verbose: true gcov: true + - name: Create codeclimate coverage + run: |- + lcov --directory . --capture --output-file lcov.info + lcov --remove lcov.info -o lcov.info '/usr/*' + sed "s=^SF:$PWD/=SF:=g" -i lcov.info # relative pats are required by codeclimate + mkdir -p /tmp/codeclimate + cc-test-reporter format-coverage -t lcov -o /tmp/codeclimate/${{ inputs.flags }}.json lcov.info + shell: bash + - uses: actions/upload-artifact@v3.1.1 + with: + path: "/tmp/codeclimate/*.json" + name: codeclimate diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index d7f796ce3b1..99e01c4778f 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -385,6 +385,28 @@ jobs: with: flags: ${{ env.pg_major }}_upgrade codecov_token: ${{ secrets.CODECOV_TOKEN }} + upload-coverage: + if: always() + env: + CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} + runs-on: ubuntu-20.04 + container: + image: ${{ needs.params.outputs.test_image_name }}:${{ fromJson(needs.params.outputs.pg16_version).full }}${{ needs.params.outputs.image_suffix }} + needs: + - params + - test-citus + - test-arbitrary-configs + - test-citus-upgrade + - test-pg-upgrade + steps: + - uses: actions/download-artifact@v3.0.1 + with: + name: "codeclimate" + path: "codeclimate" + - name: Upload coverage results to Code Climate + run: |- + cc-test-reporter sum-coverage codeclimate/*.json -o total.json + cc-test-reporter upload-coverage -i total.json ch_benchmark: name: CH Benchmark if: startsWith(github.ref, 'refs/heads/ch_benchmark/') From b2a9bd890cc41302ffd34c3b63a7f7ab951517be Mon Sep 17 00:00:00 2001 From: naisila Date: Fri, 10 Jan 2025 22:26:06 +0300 Subject: [PATCH 21/23] Include pg17 in upgrade_pg_versions --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 99e01c4778f..c08da727713 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -36,7 +36,7 @@ jobs: pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' - upgrade_pg_versions: "14.15-15.10-16.6" + upgrade_pg_versions: "14.15-15.10-16.6-17.2" steps: # Since GHA jobs need at least one step we use a noop step here. - name: Set up parameters From 314fe1e44d6865bfb8b58fed092246342632388d Mon Sep 17 00:00:00 2001 From: naisila Date: Sun, 12 Jan 2025 21:18:04 +0300 Subject: [PATCH 22/23] Naisila's locally built images that dont include pg17 --- .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 c08da727713..08149ddbd2d 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,11 +32,11 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-889e4c1" + image_suffix: "-dev-5779674" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }' - upgrade_pg_versions: "14.15-15.10-16.6-17.2" + upgrade_pg_versions: "14.15-15.10-16.6" steps: # Since GHA jobs need at least one step we use a noop step here. - name: Set up parameters From 70b84f29988c8af4d83d6be1aa2c6d59cf4663e4 Mon Sep 17 00:00:00 2001 From: naisila Date: Mon, 13 Jan 2025 15:17:37 +0300 Subject: [PATCH 23/23] RELEASE=1 make push-all --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 08149ddbd2d..d149ff650a8 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -32,7 +32,7 @@ jobs: style_checker_image_name: "ghcr.io/citusdata/stylechecker" style_checker_tools_version: "0.8.18" sql_snapshot_pg_version: "16.6" - image_suffix: "-dev-5779674" + image_suffix: "-v5779674" pg14_version: '{ "major": "14", "full": "14.15" }' pg15_version: '{ "major": "15", "full": "15.10" }' pg16_version: '{ "major": "16", "full": "16.6" }'