From d4b7a7e9735356e7b44e45b606e054191ca46452 Mon Sep 17 00:00:00 2001
From: Chizi123 <build@jsrv.com>
Date: Thu, 15 Oct 2020 06:54:15 +0000
Subject: [PATCH] more specific package locating and not readding the same packages
---
main.sh | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/main.sh b/main.sh
index f135478..d0cb1fb 100755
--- a/main.sh
+++ b/main.sh
@@ -58,7 +58,7 @@
"$1" == "ttf-win7-fonts" ]]; then
makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) --skipchecksums
else
- makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f)
+ makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) 2>&1
fi
if [[ $? != 0 ]]; then
#Register error
@@ -66,10 +66,25 @@
return 1
fi
+ #Get build artifact names
+ source PKGBUILD
+ pkgs=()
+ for i in ${pkgname[@]}; do
+ #pkgs+=("$i-$pkgver-$pkgrel")
+ pkgs+=("$(find . -mindepth 1 -maxdepth 1 -type f -name "$1*.pkg.tar.*" -not -name "*.sig" | sed 's/^\.\///')")
+ done
+
#Move package to repodir and add to repo db
- rm $REPODIR/*$1*.pkg.tar.??*
- cp *$1*.pkg.tar.?? $REPODIR/
- [[ "$SIGN" == "Y" ]] && cp *$1*.pkg.tar.??.sig $REPODIR/
+ #Dont change the database if rebuilt the same package at same release and version
+ for i in ${pkgs[@]}; do
+ if [[ -f $REPODIR/$i ]]; then
+ pkgs=${pkgs[@]/$i}
+ else
+ rm $REPODIR/*$1*.pkg.tar.*
+ cp $i $REPODIR/
+ [[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/
+ fi
+ done
# Weird exceptions
if [[ "$1" == "zoom" ]]; then
@@ -90,7 +105,9 @@
while true; do
# Wait until package is at the top of the queue and add to db
if [[ "$(head -n1 $REPODIR/.waitlist)" == "$1" ]]; then
- repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/*$1*.pkg.tar.??
+ for i in ${pkgs[@]}; do
+ repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/$i
+ done
while true; do
if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then
sleep 1
@@ -105,6 +122,16 @@
done
break
else
+ if [[ -z "$(grep $1 $REPODIR/.waitlist)" ]]; then
+ # Not on waitlist for some reason, need to readd
+ if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then
+ sleep 1
+ else
+ echo 1 > $REPODIR/.waitlist.lck
+ echo $1 >> $REPODIR/.waitlist
+ echo 0 > $REPODIR/.waitlist.lck
+ fi
+ fi
sleep 10
fi
done
@@ -128,6 +155,8 @@
sudo pacman -Syu --noconfirm
fi
+ #Remove waitlist and errors from old builds
+ rm -f $REPODIR/{.waitlist,.errors}
#update every package currently stored
for d in $(find $BUILDDIR -maxdepth 1 -mindepth 1 -type d)
do
@@ -219,7 +248,7 @@
echo "To: $EMAIL"
echo "Subject: Build errors"
echo "There were build errors for the build of $REPONAME at $(date), please address them soon."
- echo "The errors were: $1"
+ echo "The errors were: $@"
) | sendmail -t
}
--
Gitblit v1.9.3