From 42c46a08240044fcf33b5e799307b1be8769c2d0 Mon Sep 17 00:00:00 2001 From: Ahmet Gedemenli Date: Tue, 22 Mar 2022 15:57:46 +0300 Subject: [PATCH] Drop PG12 support --- .circleci/config.yml | 112 +++---------------------------------------- configure | 2 +- configure.in | 2 +- 3 files changed, 8 insertions(+), 108 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0aa0fd4b8..7444e9bb3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,10 +6,7 @@ orbs: parameters: image_suffix: type: string - default: '-v2021_10_27' - pg12_version: - type: string - default: '12.8' + default: '-vabaecad' pg13_version: type: string default: '13.4' @@ -18,7 +15,7 @@ parameters: default: '14.0' upgrade_pg_versions: type: string - default: '12.8-13.4-14.0' + default: '13.4-14.0' jobs: build: description: Build the citus extension @@ -529,10 +526,6 @@ workflows: ignore: - /release-[0-9]+\.[0-9]+.*/ # match with releaseX.Y.* - - build: - name: build-12 - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - build: name: build-13 pg_major: 13 @@ -545,80 +538,6 @@ workflows: - check-style - check-sql-snapshots - - test-citus: - name: 'test-12_check-multi' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-multi - requires: [build-12] - - test-citus: - name: 'test-12_check-multi-1' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-multi-1 - requires: [build-12] - - test-citus: - name: 'test-12_check-mx' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-multi-mx - requires: [build-12] - - test-citus: - name: 'test-12_check-vanilla' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-vanilla - requires: [build-12] - - test-citus: - name: 'test-12_check-isolation' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-isolation - requires: [build-12] - - test-citus: - name: 'test-12_check-worker' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-worker - requires: [build-12] - - test-citus: - name: 'test-12_check-operations' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-operations - requires: [build-12] - - test-citus: - name: 'test-12_check-follower-cluster' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-follower-cluster - requires: [build-12] - - test-citus: - name: 'test-12_check-columnar' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-columnar - requires: [build-12] - - test-citus: - name: 'test-12_check-columnar-isolation' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-columnar-isolation - requires: [build-12] - - tap-test-citus: - name: 'test_12_tap-recovery' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - suite: recovery - requires: [build-12] - - test-citus: - name: 'test-12_check-failure' - pg_major: 12 - image: citus/failtester - image_tag: '<< pipeline.parameters.pg12_version >>' - make: check-failure - requires: [build-12] - - test-citus: name: 'test-13_check-multi' pg_major: 13 @@ -767,11 +686,6 @@ workflows: make: check-failure requires: [build-14] - - test-arbitrary-configs: - name: 'test-12_check-arbitrary-configs' - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - requires: [build-12] - test-arbitrary-configs: name: 'test-13_check-arbitrary-configs' pg_major: 13 @@ -783,20 +697,6 @@ workflows: image_tag: '<< pipeline.parameters.pg14_version >>' requires: [build-14] - - test-pg-upgrade: - name: 'test-12-13_check-pg-upgrade' - old_pg_major: 12 - new_pg_major: 13 - image_tag: '<< pipeline.parameters.upgrade_pg_versions >>' - requires: [build-12, build-13] - - - test-pg-upgrade: - name: 'test-12-14_check-pg-upgrade' - old_pg_major: 12 - new_pg_major: 14 - image_tag: '<< pipeline.parameters.upgrade_pg_versions >>' - requires: [build-12, build-14] - - test-pg-upgrade: name: 'test-13-14_check-pg-upgrade' old_pg_major: 13 @@ -805,10 +705,10 @@ workflows: requires: [build-13, build-14] - test-citus-upgrade: - name: test-12_check-citus-upgrade - pg_major: 12 - image_tag: '<< pipeline.parameters.pg12_version >>' - requires: [build-12] + name: test-13_check-citus-upgrade + pg_major: 13 + image_tag: '<< pipeline.parameters.pg13_version >>' + requires: [build-13] - ch_benchmark: requires: [build-13] diff --git a/configure b/configure index 5766ce8d6..ff70808d2 100755 --- a/configure +++ b/configure @@ -2555,7 +2555,7 @@ if test -z "$version_num"; then as_fn_error $? "Could not detect PostgreSQL version from pg_config." "$LINENO" 5 fi -if test "$version_num" != '12' -a "$version_num" != '13' -a "$version_num" != '14'; then +if test "$version_num" != '13' -a "$version_num" != '14'; then as_fn_error $? "Citus is not compatible with the detected PostgreSQL version ${version_num}." "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: building against PostgreSQL $version_num" >&5 diff --git a/configure.in b/configure.in index cb1d15b6b..ce89fc351 100644 --- a/configure.in +++ b/configure.in @@ -74,7 +74,7 @@ if test -z "$version_num"; then AC_MSG_ERROR([Could not detect PostgreSQL version from pg_config.]) fi -if test "$version_num" != '12' -a "$version_num" != '13' -a "$version_num" != '14'; then +if test "$version_num" != '13' -a "$version_num" != '14'; then AC_MSG_ERROR([Citus is not compatible with the detected PostgreSQL version ${version_num}.]) else AC_MSG_NOTICE([building against PostgreSQL $version_num])