Merge branch 'master' of git:/home/var/www/gitrepos/courier

svarshavchik · Jan 5, 2024 · 1baadc6 · 1baadc6
2 parents 3dc0a3f + 71cf87a
commit 1baadc6
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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