From 2f7bb43fe0f3ac806e51e262af17dd4be2cc8a7b Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Wed, 13 Oct 2021 11:44:58 +0200 Subject: [PATCH] No longer require -DEXPERIMENTAL for PG14 Change cmake to no longer require -DEXPERIMENTAL when building against PG14. Run more PG14 tests (32bit, windows, sanitizer). --- .github/workflows/cron-tests.yaml | 6 ++++-- .github/workflows/linux-32bit-build-and-test.yaml | 15 +++++++++------ .github/workflows/sanitizer-build-and-test.yaml | 2 +- .github/workflows/windows-build-and-test.yaml | 7 +++++-- CMakeLists.txt | 4 ++-- scripts/gh_matrix_builder.py | 2 -- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/cron-tests.yaml b/.github/workflows/cron-tests.yaml index 8b5be4116..2275d5109 100644 --- a/.github/workflows/cron-tests.yaml +++ b/.github/workflows/cron-tests.yaml @@ -13,12 +13,14 @@ jobs: strategy: fail-fast: false matrix: - pg: [12, 13] + pg: [12, 13, 14] include: - pg: 12 pg_minor_compile: 0 - pg: 13 pg_minor_compile: 2 + - pg: 14 + pg_minor_compile: 0 env: PG_MAJOR: ${{ matrix.pg }} PG_MINOR_COMPILE: ${{ matrix.pg_minor_compile }} @@ -53,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - pg: [12, 13] + pg: [12, 13, 14] env: PG_MAJOR: ${{ matrix.pg }} PG_VERSION: ${{ matrix.pg }} diff --git a/.github/workflows/linux-32bit-build-and-test.yaml b/.github/workflows/linux-32bit-build-and-test.yaml index a8e8c3c0e..679b431d9 100644 --- a/.github/workflows/linux-32bit-build-and-test.yaml +++ b/.github/workflows/linux-32bit-build-and-test.yaml @@ -19,15 +19,18 @@ jobs: strategy: fail-fast: false matrix: - pg: [ "12.8", "13.4" ] + pg: ["12.8","13.4","14.0"] build_type: [ Debug ] include: - - pg: 12.8 - ignores: append-12 chunk_adaptive continuous_aggs_bgw_drop_chunks remote_txn transparent_decompression-12 plan_skip_scan-12 + - pg: "12.8" + ignores: append-12 debug_notice transparent_decompression-12 plan_skip_scan-12 pg_dump pg_major: 12 - - pg: 13.4 - ignores: append-13 chunk_adaptive remote_txn transparent_decompression-13 vacuum_parallel plan_skip_scan-13 + - pg: "13.4" + ignores: append-13 debug_notice transparent_decompression-13 pg_dump pg_major: 13 + - pg: "14.0" + ignores: append-14 chunk_api debug_notice dist_query transparent_decompression-14 + pg_major: 14 steps: @@ -65,7 +68,7 @@ jobs: run: | set -o pipefail export LANG=C.UTF-8 - sudo -u postgres make -k -C build installcheck IGNORES="${{ matrix.ignores }}" | tee installcheck.log + sudo -u postgres make -k -C build installcheck IGNORES="${{ matrix.ignores }}" SKIPS="chunk_adaptive" | tee installcheck.log - name: Show regression diffs if: always() diff --git a/.github/workflows/sanitizer-build-and-test.yaml b/.github/workflows/sanitizer-build-and-test.yaml index 687ea7659..a632b8df5 100644 --- a/.github/workflows/sanitizer-build-and-test.yaml +++ b/.github/workflows/sanitizer-build-and-test.yaml @@ -43,7 +43,7 @@ jobs: matrix: # "os" has to be in the matrix due to a bug in "env": https://github.community/t/how-to-use-env-context/16975 os: ["ubuntu-20.04"] - pg: ["12.8", "13.4"] + pg: ["12.8", "13.4", "14.0"] steps: - name: Install Linux Dependencies run: | diff --git a/.github/workflows/windows-build-and-test.yaml b/.github/workflows/windows-build-and-test.yaml index d2517e5a8..9b95da483 100644 --- a/.github/workflows/windows-build-and-test.yaml +++ b/.github/workflows/windows-build-and-test.yaml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - pg: [ 12, 13 ] + pg: [ 12, 13, 14 ] os: [ windows-2019 ] build_type: [ Debug, Release ] include: @@ -20,6 +20,9 @@ jobs: pkg_version: 12.8.1 - pg: 13 pkg_version: 13.4.1 + - pg: 14 + pkg_version: 14.0.1 + build_args: -DUSE_OPENSSL=OFF env: # PostgreSQL configuration PGPORT: 6543 @@ -47,7 +50,7 @@ jobs: choco feature disable --name=showDownloadProgress choco install postgresql${{ matrix.pg }} --version ${{ matrix.pkg_version }} --force -y --install-args="'--prefix $HOME\PostgreSQL\${{ matrix.pg }} --extract-only yes'" - name: Configure [${{ matrix.build_type }}] - run: cmake -B ${{ matrix.build_type }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DPG_PATH="$HOME/PostgreSQL/${{ matrix.pg }}" -DOPENSSL_ROOT_DIR="$HOME/PostgreSQL/${{ matrix.pg }}" + run: cmake -B ${{ matrix.build_type }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DPG_PATH="$HOME/PostgreSQL/${{ matrix.pg }}" -DOPENSSL_ROOT_DIR="$HOME/PostgreSQL/${{ matrix.pg }}" ${{ matrix.build_args}} # Build step: could potentially speed things up with --parallel # or "-- -m:", but MSBuild doesn't seem to be # able to realize interdependencies between targets, which leads diff --git a/CMakeLists.txt b/CMakeLists.txt index 26d6ce4dd..940d7ee0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -343,9 +343,9 @@ set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}") # Ensure that PostgreSQL version is supported and consistent with src/compat.h # version check if((${PG_VERSION_MAJOR} LESS "12") - OR (${PG_VERSION_MAJOR} GREATER "13") + OR (${PG_VERSION_MAJOR} GREATER "14") AND NOT (${EXPERIMENTAL})) - message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 12 and 13") + message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 12, 13 and 14") else() message(STATUS "Compiling against PostgreSQL version ${PG_VERSION}") endif() diff --git a/scripts/gh_matrix_builder.py b/scripts/gh_matrix_builder.py index 5aa2a9448..d8bce9eb4 100644 --- a/scripts/gh_matrix_builder.py +++ b/scripts/gh_matrix_builder.py @@ -111,8 +111,6 @@ m["include"].append(build_debug_config({"pg":PG13_LATEST})) pg14_debug_latest = { "pg": PG14_LATEST, - "tsdb_build_args": "-DEXPERIMENTAL=ON", - "coverage": False, "installcheck_args": "IGNORES='dist_query'" } m["include"].append(build_debug_config(pg14_debug_latest))