diff --git a/.forgejo/bin/deploy.sh b/.forgejo/bin/deploy.sh index b84489b..e8e811c 100755 --- a/.forgejo/bin/deploy.sh +++ b/.forgejo/bin/deploy.sh @@ -18,9 +18,8 @@ for apk in $apkgs; do # if draft, send to -testing branch branch="$branch-testing" else - for delarch in x86_64 aarch64 armv7 armhf s390x ppc64le riscv64 loongarch64 x86; do - curl -s --user $FORGE_REPO_USER:$FORGE_REPO_TOKEN -X DELETE $TARGET_REPO/$BASEBRANCH/$branch/$delarch/$name 2>&1 > /dev/null - done + # if not draft, assume that this was sent to $branch-testing and nuke it + curl -s --user $FORGE_REPO_USER:$FORGE_REPO_TOKEN -X DELETE $TARGET_REPO/$BASEBRANCH/$branch-testing/$arch/$name fi echo "Sending $name of arch $arch to $TARGET_REPO/$BASEBRANCH/$branch" @@ -28,9 +27,7 @@ for apk in $apkgs; do echo $return if [ "$return" == "package file already exists" ]; then echo "Package already exists, refreshing..." - for delarch in x86_64 aarch64 armv7 armhf s390x ppc64le riscv64 loongarch64 x86; do - curl -s --user $FORGE_REPO_USER:$FORGE_REPO_TOKEN -X DELETE $TARGET_REPO/$BASEBRANCH/$branch/$delarch/$name 2>&1 > /dev/null - done + curl -s --user $FORGE_REPO_USER:$FORGE_REPO_TOKEN -X DELETE $TARGET_REPO/$BASEBRANCH/$branch/$arch/$name curl -s --user $FORGE_REPO_USER:$FORGE_REPO_TOKEN --upload-file $apk $TARGET_REPO/$BASEBRANCH/$branch fi done diff --git a/ilot/py3-tenant-schemas-celery/APKBUILD b/ilot/py3-tenant-schemas-celery/APKBUILD index 696c391..c5f9029 100644 --- a/ilot/py3-tenant-schemas-celery/APKBUILD +++ b/ilot/py3-tenant-schemas-celery/APKBUILD @@ -4,7 +4,7 @@ pkgname=py3-tenant-schemas-celery #_pkgreal is used by apkbuild-pypi to find modules at PyPI _pkgreal=tenant-schemas-celery pkgver=2.2.0 -pkgrel=2 +pkgrel=1 pkgdesc="Celery integration for django-tenant-schemas and django-tenants" url="https://pypi.python.org/project/tenant-schemas-celery" arch="noarch"