From ad4cefd9b4243b1d70091b2ccf6c2ce2d77e4f2d Mon Sep 17 00:00:00 2001
From: v0idpwn <v0idpwn@gmail.com>
Date: Wed, 18 Oct 2023 18:50:15 +0300
Subject: [PATCH] Increase range of builder images

---
 .github/workflows/builder-images.yml |  7 +++++++
 cli/images/c-builder/Dockerfile      | 21 +++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/builder-images.yml b/.github/workflows/builder-images.yml
index d24626a0..3f091bb7 100644
--- a/.github/workflows/builder-images.yml
+++ b/.github/workflows/builder-images.yml
@@ -26,8 +26,11 @@ jobs:
       fail-fast: false
       matrix:
         pg_version:
+          - "12"
+          - "13"
           - "14"
           - "15"
+          - "16"
         pgrx_version:
           - "0.7.4"
           - "0.8.0"
@@ -38,6 +41,7 @@ jobs:
           - "0.9.7"
           - "0.9.8"
           - "0.10.0"
+          - "0.10.2"
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
@@ -77,8 +81,11 @@ jobs:
       fail-fast: false
       matrix:
         pg_version:
+          - "12"
+          - "13"
           - "14"
           - "15"
+          - "16"
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
diff --git a/cli/images/c-builder/Dockerfile b/cli/images/c-builder/Dockerfile
index 1c569681..38eaade3 100644
--- a/cli/images/c-builder/Dockerfile
+++ b/cli/images/c-builder/Dockerfile
@@ -11,10 +11,23 @@ RUN apt-get update && \
     && curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg > /dev/null \
     && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update  \
-    && apt-get install -y \
-      postgresql-${PG_VERSION} postgresql-server-dev-${PG_VERSION} \
-      pkg-config libssl-dev build-essential libclang-dev clang && \
-    rm -rf /var/lib/apt/lists/*
+    && apt-get install --allow-downgrades -y \
+      postgresql-client-common=238 \
+      postgresql-common=238 \
+      postgresql-server-dev-14 \
+      postgresql-server-dev-all \
+      pkg-config \
+      libssl-dev \
+      build-essential \
+      libclang-dev \
+      clang-14 \
+      # We need to make sure that only clang-14 is installed in the image before
+      # it tries to compile pgrx, as having multiple versions cause issues
+      # per https://github.com/pgcentralfoundation/pgrx/issues/1298
+      #
+      # Could instead do this in the pgrx builder image
+      && apt-get autoremove -y clang-13 lldb-13 lld-13 clang-15 lldb-15 lld-15 \
+      && rm -rf /var/lib/apt/lists/*
 
 USER postgres
 WORKDIR /app