From cdcc660660cba955f14e258eee4f690835310b36 Mon Sep 17 00:00:00 2001
From: Vinh Le <vinhljob@gmail.com>
Date: Tue, 22 Oct 2024 15:43:43 -0500
Subject: [PATCH] Attempt to abide and clean up workflows for unsupported PG
 versions

---
 .github/workflows/ci.yml | 17 +++++++++++++----
 bors.toml                |  4 ----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d3b219f..9383a7b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
       fail-fast: false
       max-parallel: 12
       matrix:
-        pgversion: [13, 14, 15, 16, 17]
+        pgversion: [14, 15, 16, 17]
         container:
         - os: rockylinux
           version: "9"
@@ -69,7 +69,6 @@ jobs:
           version: "22.04"
           image: ubuntu-22.04-amd64
           schedule: ${{ inputs.all-platforms || ( github.event_name == 'schedule' && github.event.schedule == '0 6 * * 1-4' ) }}
-
         exclude:
         - container:
             skip: true
@@ -80,17 +79,27 @@ jobs:
             os: centos
             version: "7"
           pgversion: 16
+        include:
         # TimescaleDB as of 2.12.0 no longer supports PostgreSQL 12.
         # To allow us to do run CI against PostgreSQL 12, we therefore explicitly
         # remove all CI's, except if we are run against the latest supported TimescaleDB
         # version for PostgreSQL 12, which is 2.11.2
-        include:
         - pgversion: 12
           container:
             image: debian-11-amd64
             os: debian
             version: "11" 
           tsdb_commit: 2.11.2
+        # TimescaleDB as of 2.16.0 no longer supports PostgreSQL 13.
+        # To allow us to do run CI against PostgreSQL 13, we therefore explicitly
+        # remove all CI's, except if we are run against the latest supported TimescaleDB
+        # version for PostgreSQL 13, which is 2.15.3
+        - pgversion: 13
+          container:
+            image: debian-11-amd64
+            os: debian
+            version: "11" 
+          tsdb_commit: 2.15.3
     env:
       # TODO Why?  Cargo default is to pass `-C incremental` to rustc; why don't we want that?
       #   https://doc.rust-lang.org/rustc/codegen-options/index.html#incremental
@@ -124,7 +133,7 @@ jobs:
 
     - name: Build and install TimescaleDB
       if: ${{ (github.event_name == 'schedule' && github.event.schedule == '0 8 * * 1-4') || inputs.tsdb-commit != '' }}
-      run: ./tools/install-timescaledb '${{ matrix.pgversion }}' '${{ matrix.tsdb_commit || inputs.tsdb-repo || 'https://github.com/timescale/timescaledb.git' }}' '${{ inputs.tsdb-commit == '' && 'main' || matrix.tsdb_commit || inputs.tsdb-commit }}'
+      run: ./tools/install-timescaledb '${{ matrix.pgversion }}' '${{ inputs.tsdb-repo || 'https://github.com/timescale/timescaledb.git' }}' '${{ inputs.tsdb-commit == '' && 'main' || matrix.tsdb_commit || inputs.tsdb-commit }}'
 
     # TODO After the container image contains a primed target dir, is this still worth it?
     #   Only possible advantage is this one is per-pg-version but what's the impact?
diff --git a/bors.toml b/bors.toml
index 0143e8b5..c959a4f4 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,11 +1,7 @@
 status = [
     "Clippy/rustfmt Test",
     "Test Postgres (12, debian, 11, debian-11-amd64)",
-    "Test Postgres (12, rockylinux, 9, rockylinux-9-x86_64)",
-    "Test Postgres (12, centos, 7, centos-7-x86_64)",
     "Test Postgres (13, debian, 11, debian-11-amd64)",
-    "Test Postgres (13, rockylinux, 9, rockylinux-9-x86_64)",
-    "Test Postgres (13, centos, 7, centos-7-x86_64)",
     "Test Postgres (14, debian, 11, debian-11-amd64)",
     "Test Postgres (14, rockylinux, 9, rockylinux-9-x86_64)",
     "Test Postgres (14, centos, 7, centos-7-x86_64)",