1 files changed, 18 insertions(+), 7 deletions(-)

M sr.ht/builds.sr.ht/APKBUILD

@@ 14,9 14,9 @@ depends="
 	py3-yaml
 "
 makedepends="py-setuptools nodejs sassc go"
-subpackages="$pkgname-images"
+subpackages="$pkgname-images:_images $pkgname-worker:_worker:any"
 source="
-	http://git.sr.ht/~sircmpwn/$pkgname/snapshot/$pkgname-$pkgver.tar.xz
+	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/${pkgver}.tar.gz
 	builds.sr.ht-worker.initd
 "
 install="$pkgname.pre-install"


@@ 27,6 27,8 @@ options="$options !check"
 build() {
 	cd "$builddir"
 	python3 setup.py build
+	cd worker
+	go build
 }
 
 package() {


@@ 34,13 36,22 @@ package() {
 	python3 setup.py install --root="$pkgdir" --optimize=1
 }
 
-images() {
-	depends="qemu-system-x86_64 builds.sr.ht"
+_images() {
+	depends="builds.sr.ht"
+	pkgdesc="builds.sr.ht build images"
 	cd "$builddir"
 	mkdir -p "$subpkgdir"/var/lib/
 	cp -R images "$subpkgdir"/var/lib/
-	install -Dm755 "$srcdir"/builds.sr.ht-worker.initd "$subpkgdir"/etc/init.d/builds.sr.ht-worker
 }
 
-sha512sums="9eab18643eec0f282a564c2d49b96f184719707d35df5cc4fdced0c8157a9004a95dc0e878f989a1f9eaadd3171316d566b957f53206ddc837965d3c8242994d  builds.sr.ht-0.4.6.tar.xz
-9a46e63e9cb24dc48c6e96d8b674a2481374c68568230ebda9e042624ff80406638a5da071e7b92769fe4feb71d5fa276d2d4ed47012fca2107d5d42ef48d6b1  builds.sr.ht-runner.initd"
+_worker() {
+	depends="builds.sr.ht-images"
+	pkgdesc="builds.sr.ht build worker"
+	cd "$builddir"/worker
+	install -Dm755 worker "$subpkgdir"/usr/bin/builds.sr.ht-worker
+	install -Dm755 "$srcdir"/builds.sr.ht-worker.initd \
+		"$subpkgdir"/etc/init.d/builds.sr.ht-worker
+}
+
+sha512sums="407d80a7927295fc1432a22f8497af9d290e0fcbb2a9fb414eb6de02f3f83b9361d00c12c07773302b97296996a61573cd032f5a53fdd99341e4daf6a959f268  builds.sr.ht-0.29.6.tar.gz
+8eafcde30a13ca91ebea29f259eda145de4f25eefe002ffbdd279a26361a4fe9da87e7b9665d1214ccd25c3a3ae46cda795c64c79a49543d1a5eb5f72808cb4f  builds.sr.ht-worker.initd"