No longer require -DEXPERIMENTAL for PG14

Change cmake to no longer require -DEXPERIMENTAL when building
against PG14. Run more PG14 tests (32bit, windows, sanitizer).
This commit is contained in:
Sven Klemm 2021-10-13 11:44:58 +02:00 committed by Sven Klemm
parent f686b2af40
commit 2f7bb43fe0
6 changed files with 21 additions and 15 deletions

View File

@ -13,12 +13,14 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
pg: [12, 13] pg: [12, 13, 14]
include: include:
- pg: 12 - pg: 12
pg_minor_compile: 0 pg_minor_compile: 0
- pg: 13 - pg: 13
pg_minor_compile: 2 pg_minor_compile: 2
- pg: 14
pg_minor_compile: 0
env: env:
PG_MAJOR: ${{ matrix.pg }} PG_MAJOR: ${{ matrix.pg }}
PG_MINOR_COMPILE: ${{ matrix.pg_minor_compile }} PG_MINOR_COMPILE: ${{ matrix.pg_minor_compile }}
@ -53,7 +55,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
pg: [12, 13] pg: [12, 13, 14]
env: env:
PG_MAJOR: ${{ matrix.pg }} PG_MAJOR: ${{ matrix.pg }}
PG_VERSION: ${{ matrix.pg }} PG_VERSION: ${{ matrix.pg }}

View File

@ -19,15 +19,18 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
pg: [ "12.8", "13.4" ] pg: ["12.8","13.4","14.0"]
build_type: [ Debug ] build_type: [ Debug ]
include: include:
- pg: 12.8 - pg: "12.8"
ignores: append-12 chunk_adaptive continuous_aggs_bgw_drop_chunks remote_txn transparent_decompression-12 plan_skip_scan-12 ignores: append-12 debug_notice transparent_decompression-12 plan_skip_scan-12 pg_dump
pg_major: 12 pg_major: 12
- pg: 13.4 - pg: "13.4"
ignores: append-13 chunk_adaptive remote_txn transparent_decompression-13 vacuum_parallel plan_skip_scan-13 ignores: append-13 debug_notice transparent_decompression-13 pg_dump
pg_major: 13 pg_major: 13
- pg: "14.0"
ignores: append-14 chunk_api debug_notice dist_query transparent_decompression-14
pg_major: 14
steps: steps:
@ -65,7 +68,7 @@ jobs:
run: | run: |
set -o pipefail set -o pipefail
export LANG=C.UTF-8 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 - name: Show regression diffs
if: always() if: always()

View File

@ -43,7 +43,7 @@ jobs:
matrix: 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" 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"] os: ["ubuntu-20.04"]
pg: ["12.8", "13.4"] pg: ["12.8", "13.4", "14.0"]
steps: steps:
- name: Install Linux Dependencies - name: Install Linux Dependencies
run: | run: |

View File

@ -12,7 +12,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
pg: [ 12, 13 ] pg: [ 12, 13, 14 ]
os: [ windows-2019 ] os: [ windows-2019 ]
build_type: [ Debug, Release ] build_type: [ Debug, Release ]
include: include:
@ -20,6 +20,9 @@ jobs:
pkg_version: 12.8.1 pkg_version: 12.8.1
- pg: 13 - pg: 13
pkg_version: 13.4.1 pkg_version: 13.4.1
- pg: 14
pkg_version: 14.0.1
build_args: -DUSE_OPENSSL=OFF
env: env:
# PostgreSQL configuration # PostgreSQL configuration
PGPORT: 6543 PGPORT: 6543
@ -47,7 +50,7 @@ jobs:
choco feature disable --name=showDownloadProgress 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'" 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 }}] - 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 # Build step: could potentially speed things up with --parallel
# <num_cpu> or "-- -m:<num_cpu>", but MSBuild doesn't seem to be # <num_cpu> or "-- -m:<num_cpu>", but MSBuild doesn't seem to be
# able to realize interdependencies between targets, which leads # able to realize interdependencies between targets, which leads

View File

@ -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 # Ensure that PostgreSQL version is supported and consistent with src/compat.h
# version check # version check
if((${PG_VERSION_MAJOR} LESS "12") if((${PG_VERSION_MAJOR} LESS "12")
OR (${PG_VERSION_MAJOR} GREATER "13") OR (${PG_VERSION_MAJOR} GREATER "14")
AND NOT (${EXPERIMENTAL})) 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() else()
message(STATUS "Compiling against PostgreSQL version ${PG_VERSION}") message(STATUS "Compiling against PostgreSQL version ${PG_VERSION}")
endif() endif()

View File

@ -111,8 +111,6 @@ m["include"].append(build_debug_config({"pg":PG13_LATEST}))
pg14_debug_latest = { pg14_debug_latest = {
"pg": PG14_LATEST, "pg": PG14_LATEST,
"tsdb_build_args": "-DEXPERIMENTAL=ON",
"coverage": False,
"installcheck_args": "IGNORES='dist_query'" "installcheck_args": "IGNORES='dist_query'"
} }
m["include"].append(build_debug_config(pg14_debug_latest)) m["include"].append(build_debug_config(pg14_debug_latest))