From 71cf87a2d33ed738052edb8cdf55ca793d603b23 Mon Sep 17 00:00:00 2001
From: Sam Varshavchik <mrsam@courier-mta.com>
Date: Mon, 1 Jan 2024 20:55:53 -0500
Subject: [PATCH] Update ubuntu CI script to use apt to install built packages.

---
 ci-scripts/ubuntu/build_all          | 10 ++++++++++
 ci-scripts/ubuntu/build_all_setup    | 11 ++++++++---
 ci-scripts/ubuntu/build_shared       | 15 +++++++++------
 ci-scripts/ubuntu/build_shared_setup | 10 ++++++++++
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/ci-scripts/ubuntu/build_all b/ci-scripts/ubuntu/build_all
index 558b04b..c328e9b 100644
--- a/ci-scripts/ubuntu/build_all
+++ b/ci-scripts/ubuntu/build_all
@@ -11,3 +11,13 @@ mv ../*.tar.bz2 .
 tar xf *
 cd */.
 ./courier-debuild -us -uc
+ls -al deb
+eval `/usr/bin/dpkg-architecture`
+cp deb/*.deb /var/local/packages/pool
+(
+   cd /var/local/packages
+   dpkg-scanpackages pool >dists/main/main/binary-$DEB_TARGET_ARCH/Packages
+)
+
+apt update
+apt install `ls *.deb | sed 's/_.*//'`
diff --git a/ci-scripts/ubuntu/build_all_setup b/ci-scripts/ubuntu/build_all_setup
index f34f0be..d929667 100644
--- a/ci-scripts/ubuntu/build_all_setup
+++ b/ci-scripts/ubuntu/build_all_setup
@@ -2,8 +2,13 @@ set -evx
 
 sh ci-scripts/ubuntu/build_shared_setup
 
-dpkg -i libcourier-auth-config*.deb
-rm -f libcourier-auth-config*.deb
+eval `/usr/bin/dpkg-architecture`
+cp *.deb /var/local/packages/pool
+(
+   cd /var/local/packages
+   dpkg-scanpackages pool >dists/main/main/binary-$DEB_TARGET_ARCH/Packages
+)
 
-dpkg -i *.deb
+apt update
+apt install `ls *.deb | sed 's/_.*//'`
 rm -f *.deb
diff --git a/ci-scripts/ubuntu/build_shared b/ci-scripts/ubuntu/build_shared
index 19aa395..b35bc96 100644
--- a/ci-scripts/ubuntu/build_shared
+++ b/ci-scripts/ubuntu/build_shared
@@ -21,11 +21,14 @@ rm -f deb/*userdb*
 
 rm -f deb/*courier-sox-server*
 
-if test -f deb/libcourier-auth-config*.deb
-then
-  dpkg -i deb/libcourier-auth-config*.deb
-  mv deb/libcourier-auth-config*.deb ../../packages
-fi
+eval `/usr/bin/dpkg-architecture`
+cp deb/*.deb /var/local/packages/pool
+(
+   cd /var/local/packages
+   dpkg-scanpackages pool >dists/main/main/binary-$DEB_TARGET_ARCH/Packages
+)
+
+apt update
+apt install `cd deb; ls *.deb | sed 's/_.*//'`
 
-dpkg -i deb/*.deb
 mv deb/*.deb ../../packages
diff --git a/ci-scripts/ubuntu/build_shared_setup b/ci-scripts/ubuntu/build_shared_setup
index 3321dab..a5b32a7 100644
--- a/ci-scripts/ubuntu/build_shared_setup
+++ b/ci-scripts/ubuntu/build_shared_setup
@@ -37,6 +37,16 @@ apt install -y \
 	pkg-config		\
 	wget
 
+echo 'deb [trusted=yes] file:///var/local/packages main main' >/etc/apt/sources.list.new
+cat /etc/apt/sources.list >>/etc/apt/sources.list.new
+mv /etc/apt/sources.list.new /etc/apt/sources.list
+
+eval `/usr/bin/dpkg-architecture`
+mkdir -p /var/local/packages/pool
+mkdir -p /var/local/packages/dists/main/main/binary-$DEB_TARGET_ARCH
+cd /var/local/packages
+dpkg-scanpackages pool >dists/main/main/binary-$DEB_TARGET_ARCH/Packages
+
 locale-gen en_US.UTF-8
 
 mkdir -p $HOME/bin