2 files changed, 20 insertions(+), 6 deletions(-)

M sr.ht/buildall.yml
M sr.ht/py-tinycss2/APKBUILD

@@ 11,8 11,10 @@ environment:
   repo_path: /var/www/mirror.sr.ht/alpine/sr.ht/x86_64
   packages:
     - py-alembic
+    - py-cssselect2
     - py-editor
     - py-qrcode
+    - py-tinycss2
     - py-weasyprint
     - py3-amqp
     - py3-anyjson


@@ 65,10 67,13 @@ tasks:
       do
           cd "$package"
           pkgver="$(get_pkgvar pkgver)"
-          prev_pkgver=$(apk search "$package" | cut -d '-' -f2-)
+          prev_pkgver=$(apk search "$package" | cut -c$((${#package}+2))-)
           prev_pkgrel=$(printf "%s" "$prev_pkgver" | cut -d'-' -f2 | cut -d'r' -f2)
-          pkgrel=$((prev_pkgrel + 1))
-          sed -e "s/pkgrel=.*/pkgrel=$pkgrel/" -i APKBUILD
+          if [ "$prev_pkgver" != "$pkgver" ]
+          then
+              pkgrel=$((prev_pkgrel + 1))
+              sed -e "s/pkgrel=.*/pkgrel=$pkgrel/" -i APKBUILD
+          fi
           abuild checksum
           abuild -r
           sudo apk add ~/packages/sr.ht/$(uname -m)/"$package"-$pkgver-r$pkgrel.apk


@@ 84,10 89,19 @@ tasks:
           ssh $sshopts $repo_server rm -f $repo_path/${package}'*.apk'
           pkgver="$(get_pkgvar pkgver)"
           pkgrel="$(get_pkgvar pkgrel)"
+          subpkgs="$(get_pkgvar subpackages)"
           rsync --blocking-io \
             -rPe "ssh $sshopts" \
             ~/packages/sr.ht/$(uname -m)/"$package"-$pkgver-r$pkgrel.apk \
             $repo_server:$repo_path/
+          for subp in $subpkgs
+          do
+              subp="$(printf '%s' "$subp" | cut -d: -f1)"
+              rsync --blocking-io \
+                -rPe "ssh $sshopts" \
+                ~/packages/sr.ht/$(uname -m)/"$subp"-$pkgver-r$pkgrel.apk \
+                $repo_server:$repo_path/
+          done
           ssh $sshopts $repo_server find $repo_path -type f -name '*.apk' -print0 |
             ssh $sshopts $repo_server xargs -0 apk index \
               --rewrite-arch x86_64 \

@@ 29,9 29,9 @@ build() {
 
 check() {
 	cd "$builddir"
-	python2 setup.py check
+	python2 setup.py pytest
 	cd "$builddir"-py3
-	python3 setup.py check
+	python3 setup.py pytest
 }
 
 package() {


@@ 56,4 56,4 @@ _py() {
 	$python setup.py install --prefix=/usr --root="$subpkgdir"
 }
 
-sha512sums="d6007934c301904308bd4821626d6a7bb504268c5c71a31f7486faebb3dd649fad18774737cab39eb13a0916635bb58eba2c8432c72cc5a461cea2a5d874b1ee  WeasyPrint-0.42.3.tar.gz"
+sha512sums="fa064bbb06d641a497a3c1eb35118bbf8ca8c4d32fbd3d8c64bb10d6cdab24387e77cd4c3277a957f23de2bd527a407836245f4387d7f880958858bd9cc7ab89  tinycss2-0.6.1.tar.gz"