From a7c8641e04ca01d9e3a7973a7b3c817a430004dd Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Tue, 17 May 2022 14:00:07 +0200 Subject: [PATCH] Bump postgres versions used in CI Bump postgres versions used in CI to 14.3, 13.7 and 12.11. --- .github/workflows/coverity.yaml | 2 +- .github/workflows/linux-32bit-build-and-test.yaml | 8 ++++---- .github/workflows/sanitizer-build-and-test.yaml | 2 +- .github/workflows/sqlsmith.yaml | 2 +- .github/workflows/windows-build-and-test.yaml | 6 +++--- scripts/docker-build.sh | 2 +- scripts/gh_matrix_builder.py | 6 +++--- scripts/test_downgrade_from_tag.sh | 2 +- scripts/test_update_from_tag.sh | 2 +- scripts/test_updates.sh | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml index 2423784a1..b67c35131 100644 --- a/.github/workflows/coverity.yaml +++ b/.github/workflows/coverity.yaml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - pg: ["12.10", "13.6", "14.2"] + pg: ["12.11", "13.7", "14.3"] os: [ubuntu-20.04] env: PG_SRC_DIR: pgbuild diff --git a/.github/workflows/linux-32bit-build-and-test.yaml b/.github/workflows/linux-32bit-build-and-test.yaml index 64db97baa..1cd3644c9 100644 --- a/.github/workflows/linux-32bit-build-and-test.yaml +++ b/.github/workflows/linux-32bit-build-and-test.yaml @@ -19,16 +19,16 @@ jobs: strategy: fail-fast: false matrix: - pg: ["12.10","13.6","14.2"] + pg: ["12.11","13.7","14.3"] build_type: [ Debug ] include: - - pg: "12.10" + - pg: "12.11" ignores: append-12 debug_notice transparent_decompression-12 transparent_decompress_chunk-12 plan_skip_scan-12 pg_dump pg_major: 12 - - pg: "13.6" + - pg: "13.7" ignores: append-13 debug_notice transparent_decompression-13 transparent_decompress_chunk-13 pg_dump pg_major: 13 - - pg: "14.2" + - pg: "14.3" ignores: append-14 debug_notice transparent_decompression-14 transparent_decompress_chunk-14 pg_dump pg_major: 14 diff --git a/.github/workflows/sanitizer-build-and-test.yaml b/.github/workflows/sanitizer-build-and-test.yaml index 0fcc9963c..37c47f851 100644 --- a/.github/workflows/sanitizer-build-and-test.yaml +++ b/.github/workflows/sanitizer-build-and-test.yaml @@ -44,7 +44,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.10", "13.6", "14.2"] + pg: ["12.11","13.7","14.3"] steps: - name: Install Linux Dependencies run: | diff --git a/.github/workflows/sqlsmith.yaml b/.github/workflows/sqlsmith.yaml index 58f22685a..b5363f0b2 100644 --- a/.github/workflows/sqlsmith.yaml +++ b/.github/workflows/sqlsmith.yaml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: ["ubuntu-20.04"] - pg: ["14.2"] + pg: ["14.3"] cc: ["gcc"] build_type: ["Debug"] fail-fast: false diff --git a/.github/workflows/windows-build-and-test.yaml b/.github/workflows/windows-build-and-test.yaml index 607131363..d17672da9 100644 --- a/.github/workflows/windows-build-and-test.yaml +++ b/.github/workflows/windows-build-and-test.yaml @@ -17,11 +17,11 @@ jobs: build_type: [ Debug, Release ] include: - pg: 12 - pkg_version: 12.10.1 + pkg_version: 12.11.1 - pg: 13 - pkg_version: 13.6.1 + pkg_version: 13.7.1 - pg: 14 - pkg_version: 14.2.1 + pkg_version: 14.3.1 build_args: -DUSE_OPENSSL=OFF env: # PostgreSQL configuration diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh index 75897e6ec..9de09e962 100755 --- a/scripts/docker-build.sh +++ b/scripts/docker-build.sh @@ -5,7 +5,7 @@ # SCRIPT_DIR=$(dirname $0) BASE_DIR=${PWD}/${SCRIPT_DIR}/.. -PG_VERSION=${PG_VERSION:-14.2} +PG_VERSION=${PG_VERSION:-14.3} PG_IMAGE_TAG=${PG_IMAGE_TAG:-${PG_VERSION}-alpine} BUILD_CONTAINER_NAME=${BUILD_CONTAINER_NAME:-pgbuild} BUILD_IMAGE_NAME=${BUILD_IMAGE_NAME:-$USER/pgbuild} diff --git a/scripts/gh_matrix_builder.py b/scripts/gh_matrix_builder.py index d22448287..4455997c0 100644 --- a/scripts/gh_matrix_builder.py +++ b/scripts/gh_matrix_builder.py @@ -22,11 +22,11 @@ import sys event_type = sys.argv[1] PG12_EARLIEST = "12.0" -PG12_LATEST = "12.10" +PG12_LATEST = "12.11" PG13_EARLIEST = "13.2" -PG13_LATEST = "13.6" +PG13_LATEST = "13.7" PG14_EARLIEST = "14.0" -PG14_LATEST = "14.2" +PG14_LATEST = "14.3" m = {"include": [],} diff --git a/scripts/test_downgrade_from_tag.sh b/scripts/test_downgrade_from_tag.sh index ee071f481..f94b9de0d 100755 --- a/scripts/test_downgrade_from_tag.sh +++ b/scripts/test_downgrade_from_tag.sh @@ -10,7 +10,7 @@ TEST_VERSION=${TEST_VERSION:-v2} TEST_TMPDIR=${TEST_TMPDIR:-$(mktemp -d 2>/dev/null || mktemp -d -t 'timescaledb_downgrade_test' || mkdir -p /tmp/${RANDOM})} UPDATE_PG_PORT=${UPDATE_PG_PORT:-6432} CLEAN_PG_PORT=${CLEAN_PG_PORT:-6433} -PG_VERSION=${PG_VERSION:-14.2} +PG_VERSION=${PG_VERSION:-14.3} GIT_ID=$(git -C ${BASE_DIR} describe --dirty --always | sed -e "s|/|_|g") UPDATE_FROM_IMAGE=${UPDATE_FROM_IMAGE:-timescale/timescaledb} UPDATE_FROM_TAG=${UPDATE_FROM_TAG:-0.1.0} diff --git a/scripts/test_update_from_tag.sh b/scripts/test_update_from_tag.sh index fca6e6466..cd95dc7fc 100755 --- a/scripts/test_update_from_tag.sh +++ b/scripts/test_update_from_tag.sh @@ -10,7 +10,7 @@ TEST_VERSION=${TEST_VERSION:-v2} TEST_TMPDIR=${TEST_TMPDIR:-$(mktemp -d 2>/dev/null || mktemp -d -t 'timescaledb_update_test' || mkdir -p /tmp/${RANDOM})} UPDATE_PG_PORT=${UPDATE_PG_PORT:-6432} CLEAN_PG_PORT=${CLEAN_PG_PORT:-6433} -PG_VERSION=${PG_VERSION:-14.2} +PG_VERSION=${PG_VERSION:-14.3} GIT_ID=$(git -C ${BASE_DIR} describe --dirty --always | sed -e "s|/|_|g") UPDATE_FROM_IMAGE=${UPDATE_FROM_IMAGE:-timescale/timescaledb} UPDATE_FROM_TAG=${UPDATE_FROM_TAG:-0.1.0} diff --git a/scripts/test_updates.sh b/scripts/test_updates.sh index d335ae10d..f92dbabcd 100755 --- a/scripts/test_updates.sh +++ b/scripts/test_updates.sh @@ -11,7 +11,7 @@ TEST_VERSION=${TEST_VERSION:-} GIT_ID=$(git -C ${BASE_DIR} describe --dirty --always | sed -e "s|/|_|g") UPDATE_TO_IMAGE=${UPDATE_TO_IMAGE:-update_test} UPDATE_TO_TAG=${UPDATE_TO_TAG:-${GIT_ID}} -PG_VERSION=${PG_VERSION:-14.2} +PG_VERSION=${PG_VERSION:-14.3} # This will propagate to the test_update_from_tags.sh script export TEST_REPAIR