Use LLVM 16 on bullseye; build PG18 without llvm on focal

PG18 needs LLVM 18+, so bump up to 16 on bullseye (for all majors).
Focal has only 10 and 12, disable LLVM there for PG18.

diff --git a/jenkins/generate-pgdg-source b/jenkins/generate-pgdg-source
index 6252abe0ee1de75789c79e9b3cbfc37429581b35..e334a363ac32d3699fc3068af17fd956c43833ce 100755 (executable)
--- a/jenkins/generate-pgdg-source
+++ b/jenkins/generate-pgdg-source
@@ -162,13 +162,13 @@ esac
 # LLVM: default available
 # trixie     16 15 17
 # bookworm   14 15 16
-# bullseye   11 13 (16 in pu)
+# bullseye   11 13 16
 # buster      7 13
 # noble      17 15 16
 # mantic     16 15
 # lunar      15 16
 # jammy      14 15
-# focal      10
+# focal      10 12
 
 case $PACKAGE in
   postgresql-11) # not compatible with LLVM 16: llvmjit.so: undefined symbol: LLVMBuildGEP
@@ -179,10 +179,10 @@ case $PACKAGE in
       jammy) llvm_version 15 ;;      # upgrade to 15
     esac
     ;;
-  postgresql-1[1-9]|postgresql-1[1-9]ee|postgresql-2*)
+  postgresql-1[2-9]|postgresql-1[2-9]ee|postgresql-2*)
     case $distribution in
       bookworm) llvm_version 16 ;; # upgrade to 16
-      bullseye) llvm_version 13 ;; # upgrade to 13
+      bullseye) llvm_version 16 ;; # upgrade to 16
       buster) llvm_version 13 ;;   # upgrade to 13
       noble) llvm_version 17 ;;    # downgrade to 17 <CAFj8pRACpVFr7LMdVYENUkScG5FCYMZDDdSGNU-tch+w98OxYg@mail.gmail.com>
       jammy) llvm_version 15 ;;    # upgrade to 15

diff --git a/jenkins/sbuild-package b/jenkins/sbuild-package
index 71dedf5ce1d85bbb2f3a40d134f9b93a96818892..dd7803fa7f9e21515b4020267a1d441765b717bb 100755 (executable)
--- a/jenkins/sbuild-package
+++ b/jenkins/sbuild-package
@@ -100,6 +100,13 @@ case $PACKAGE in
     esac
     ;;
 
+  postgresql-18)
+    case $distribution in
+      # PG18 needs llvm 13+, but focal has only 10 and 12
+      focal) DEB_BUILD_PROFILES="$DEB_BUILD_PROFILES pkg.postgresql.nollvm" ;;
+    esac
+    ;;
+
   vip-manager)
     case $distribution in
       buster|jammy|focal)