From bf003626536a5e1dfc03d25a3f677f4a403343b3 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 28 Oct 2024 06:38:53 -0400 Subject: [PATCH 01/12] ilot/listmonk: upgrade to 4.0.1 --- ilot/listmonk/APKBUILD | 8 +++++--- ilot/listmonk/listmonk.post-install | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ilot/listmonk/APKBUILD b/ilot/listmonk/APKBUILD index 7b799f2..2d65fa6 100644 --- a/ilot/listmonk/APKBUILD +++ b/ilot/listmonk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=listmonk -pkgver=3.0.0 -pkgrel=2 +pkgver=4.0.1 +pkgrel=0 pkgdesc='Self-hosted newsletter and mailing list manager with a modern dashboard' arch="all" url=https://listmonk.app @@ -10,6 +10,7 @@ license="AGPL3" depends=" libcap-setcap postgresql + postgresql-contrib procps " makedepends="go npm nodejs yarn" @@ -52,6 +53,7 @@ package() { install -Dm644 -t "$pkgdir"/usr/share/webapps/listmonk/ \ schema.sql \ queries.sql \ + permissions.json \ config.toml.sample install -Dm755 listmonk "$pkgdir"/usr/share/webapps/listmonk/ install -Dm644 -t "$pkgdir"/usr/share/webapps/listmonk/frontend/dist/ \ @@ -65,7 +67,7 @@ package() { ln -s /etc/listmonk/config.toml "$pkgdir"/usr/share/webapps/listmonk/config.toml } sha512sums=" -afd0ea1d4d2b2753c3043526590cf09c45a541a2d818f5d1581644ffd10818326fd553a3b04bca59494860a7bb6e96364b08afd33d337a9fc5c71bedd1a5ee6c listmonk-3.0.0.tar.gz +ae5c338b756bb9d84739ab8b04b591e33ee7f6a579725083ec95e2609dbff55adbd1f2a11c0487b971aa030a3a35347cf54966820e1320b4144351935b2497d8 listmonk-4.0.1.tar.gz 939450af4b23708e3d23a5a88fad4c24b957090bdd21351a6dd520959e52e45e5fcac117a3eafa280d9506616dae39ad3943589571f008cac5abe1ffd8062424 listmonk.sh 8e9c0b1f335c295fb741418246eb17c7566e5e4200a284c6483433e8ddbf5250aa692435211cf062ad1dfcdce3fae9148def28f03f2492d33fe5e66cbeebd4bd listmonk.openrc " diff --git a/ilot/listmonk/listmonk.post-install b/ilot/listmonk/listmonk.post-install index fe3cc8d..3e25f91 100644 --- a/ilot/listmonk/listmonk.post-install +++ b/ilot/listmonk/listmonk.post-install @@ -10,6 +10,12 @@ if [ "${0##*.}" = 'post-upgrade' ]; then * * listmonk --upgrade * + * If upgrading from v3.0.0, please first set the following env variables: + * + * export LISTMONK_ADMIN_USER=your-admin-user + * export LISTMONK_ADMIN_PASSWORD=your-admin-password + * listmonk --upgrade + * EOF else cat >&2 <<-EOF From bd438f03e40429bdbcbbeb42d6e7c95786ef27da Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 28 Oct 2024 08:21:59 -0400 Subject: [PATCH 02/12] Check every day at 5 am instead of hourly --- .forgejo/workflows/check-ilot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/check-ilot.yml b/.forgejo/workflows/check-ilot.yml index 405a652..652930d 100644 --- a/.forgejo/workflows/check-ilot.yml +++ b/.forgejo/workflows/check-ilot.yml @@ -2,7 +2,7 @@ on: workflow_dispatch: schedule: - - cron: '@hourly' + - cron: '0 5 * * *' jobs: check-user: From fe5894b46f930982c29461ef2dc811f99ed48ab8 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 07:12:57 -0400 Subject: [PATCH 03/12] ilot/wikijs: upgrade to 2.5.305 --- ilot/wikijs/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ilot/wikijs/APKBUILD b/ilot/wikijs/APKBUILD index 43d8189..3340f14 100644 --- a/ilot/wikijs/APKBUILD +++ b/ilot/wikijs/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) pkgname=wikijs -pkgver=2.5.303 -pkgrel=1 +pkgver=2.5.305 +pkgrel=0 pkgdesc="Wiki.js | A modern, lightweight and powerful wiki app built on Node.js" license="AGPL-3.0" arch="!armv7 x86_64" @@ -53,7 +53,7 @@ package() { chown 5494:5494 "$pkgdir"/var/lib/wikijs } sha512sums=" -a463d79ad0d8ff15dbe568b839094d697c6de0b2e991b77a4944e2a82f9789de6840e504a4673e4e0900d61596e880ca276008de86dac4f05f5823dc0427d2fc wikijs-2.5.303.tar.gz +e715e2d93fd176dc93676b3dd97d8dd745589552a7d67971fce0c1097f607fa44a3147534709a82b3ad13dda95d7c5833bc30ec37538c6cdef54ac309e6b44d1 wikijs-2.5.305.tar.gz 355131ee5617348b82681cb8543c784eea59689990a268ecd3b77d44fe9abcca9c86fb8b047f0a8faeba079c650faa7790c5dd65418d313cd7561f38bb590c03 wikijs.initd 07b536c20e370d2a926038165f0e953283259c213a80a8648419565f5359ab05f528ac310e81606914013da212270df6feddb22e514cbcb2464c8274c956e4af config.sample.yml.patch " From 702d61a5dc7f2c0b3fd1981d13964d05320ef247 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 07:26:45 -0400 Subject: [PATCH 04/12] ilot/py3-django-cte: drop due to inclusion in community --- ilot/py3-django-cte/APKBUILD | 39 ------------------------------------ 1 file changed, 39 deletions(-) delete mode 100644 ilot/py3-django-cte/APKBUILD diff --git a/ilot/py3-django-cte/APKBUILD b/ilot/py3-django-cte/APKBUILD deleted file mode 100644 index ec94c5c..0000000 --- a/ilot/py3-django-cte/APKBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-django-cte -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=django-cte -pkgver=1.3.3 -pkgrel=0 -pkgdesc="Common Table Expressions (CTE) for Django" -url="https://pypi.python.org/project/django-cte" -arch="noarch" -license="BSD-Clause-3" -depends="py3-django" -checkdepends="py3-pytest" -makedepends="py3-setuptools py3-gpep517 py3-wheel" -source="$pkgname-$pkgver.tar.gz::https://github.com/dimagi/django-cte/archive/refs/tags/v$pkgver.tar.gz" -options="!check" # Requires active psql -builddir="$srcdir/$_pkgreal-$pkgver" -subpackages="$pkgname-pyc" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - DJANGO_SETTINGS_MODULE=tests.settings .testenv/bin/python3 -m pytest -v -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -543ca5d7ae546d00facadaccb23498534f9016ef7f1ce68cf0ca7640e8d0d4bbf0e1354e2d1b02d6787cc51c58098deda5783100ff9b8974fd9abe37ec662402 py3-django-cte-1.3.3.tar.gz -" From 28175614b79fff069279df00f2e21a033605e168 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 07:26:47 -0400 Subject: [PATCH 05/12] ilot/py3-django-dynamic-fixture: drop due to inclusion in community --- ilot/py3-django-dynamic-fixture/APKBUILD | 38 ------------------------ 1 file changed, 38 deletions(-) delete mode 100644 ilot/py3-django-dynamic-fixture/APKBUILD diff --git a/ilot/py3-django-dynamic-fixture/APKBUILD b/ilot/py3-django-dynamic-fixture/APKBUILD deleted file mode 100644 index 92533aa..0000000 --- a/ilot/py3-django-dynamic-fixture/APKBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-django-dynamic-fixture -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=django-dynamic-fixture -pkgver=4.0.1 -pkgrel=0 -pkgdesc="A complete library to create dynamic model instances for testing purposes." -url="https://pypi.python.org/project/django-dynamic-fixture" -arch="noarch" -license="BDS-3-Clause" -depends="py3-django" -checkdepends="py3-pytest py3-pytest-django py3-pytest-cov py3-psycopg2" -makedepends="py3-setuptools py3-gpep517 py3-wheel poetry" -source="$pkgname-$pkgver.tar.gz::https://github.com/paulocheque/django-dynamic-fixture/archive/refs/tags/$pkgver.tar.gz" -builddir="$srcdir/$_pkgreal-$pkgver" -subpackages="$pkgname-pyc" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest -v -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -e2a1a67459cf35f092b8f3e34a6162ef3334062f2f779df593f1f7e738371e28996a7e96d6a08397385a7b29d59be143284cf4a921cb2da972ee238d1ff6660d py3-django-dynamic-fixture-4.0.1.tar.gz -" From c4a06a61176eeda1c7e706e58a22400d39ce04ea Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 07:26:50 -0400 Subject: [PATCH 06/12] ilot/py3-django-pgactivity: drop due to inclusion in community --- ilot/py3-django-pgactivity/APKBUILD | 39 ----------------------------- 1 file changed, 39 deletions(-) delete mode 100644 ilot/py3-django-pgactivity/APKBUILD diff --git a/ilot/py3-django-pgactivity/APKBUILD b/ilot/py3-django-pgactivity/APKBUILD deleted file mode 100644 index 58842a0..0000000 --- a/ilot/py3-django-pgactivity/APKBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-django-pgactivity -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=django-pgactivity -pkgver=1.5.0 -pkgrel=0 -pkgdesc="View, filter, and kill Postgres queries." -url="https://pypi.python.org/project/django-pgactivity" -arch="noarch" -license="BDS-3-Clause" -depends="py3-django" -checkdepends="py3-pytest py3-pytest-cov py3-pytest-django py3-pytest-mock py3-django-extensions py3-dj-database-url py3-psycopg2 py3-typing-extensions py3-django-dynamic-fixture" -makedepends="py3-setuptools py3-gpep517 py3-wheel poetry" -options="!check" # requires database setup -source="$pkgname-$pkgver.tar.gz::https://github.com/Opus10/django-pgactivity/archive/refs/tags/$pkgver.tar.gz" -builddir="$srcdir/$_pkgreal-$pkgver" -subpackages="$pkgname-pyc" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest -v -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -e052965e05878f75e790c30c4faeafec1900080f9d6119e20331c4418c3e9b6f2331b17b97902c41b538e88d6182466513674c33b146e2cbf566c56cbed20a81 py3-django-pgactivity-1.5.0.tar.gz -" From 5c78bf6cf217c78c547c1a1b6aa21f47b431125d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 07:26:53 -0400 Subject: [PATCH 07/12] ilot/py3-django-pglock: drop due to inclusion in community --- ilot/py3-django-pglock/APKBUILD | 40 --------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 ilot/py3-django-pglock/APKBUILD diff --git a/ilot/py3-django-pglock/APKBUILD b/ilot/py3-django-pglock/APKBUILD deleted file mode 100644 index a1dea2e..0000000 --- a/ilot/py3-django-pglock/APKBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-django-pglock -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=django-pglock -pkgver=1.6.2 -pkgrel=0 -pkgdesc="Postgres advisory locks, table locks, and blocking lock management." -url="https://pypi.python.org/project/django-pglock" -arch="noarch" -license="BDS-3-Clause" -depends="py3-django py3-django-pgactivity" -# missing py3-pytest-reraise py3-pytest-dotenv -checkdepends="py3-pytest py3-pytest-cov py3-pytest-django py3-pytest-mock py3-django-extensions py3-django-dynamic-fixture" -makedepends="py3-setuptools py3-gpep517 py3-wheel poetry" -source="$pkgname-$pkgver.tar.gz::https://github.com/Opus10/django-pglock/archive/refs/tags/$pkgver.tar.gz" -options="!check" # requires test database -builddir="$srcdir/$_pkgreal-$pkgver" -subpackages="$pkgname-pyc" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest -v -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -f87914934c72686d38c175d9a617b96ded332d3ad2caa5e1d5f1dc9cd0e3444a50bf29d66b47162221fd9cd12a27056c8d3cad3154f4a09f69b3fd92becb896f py3-django-pglock-1.6.2.tar.gz -" From 1674b6f550d5b5a065b2d9c70bd432c1981a1b97 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 07:26:55 -0400 Subject: [PATCH 08/12] ilot/py3-scim2-filter-parser: drop due to inclusion in community --- ilot/py3-scim2-filter-parser/APKBUILD | 38 --------------------------- 1 file changed, 38 deletions(-) delete mode 100644 ilot/py3-scim2-filter-parser/APKBUILD diff --git a/ilot/py3-scim2-filter-parser/APKBUILD b/ilot/py3-scim2-filter-parser/APKBUILD deleted file mode 100644 index 15d12e5..0000000 --- a/ilot/py3-scim2-filter-parser/APKBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-scim2-filter-parser -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=scim2-filter-parser -pkgver=0.5.0 -pkgrel=1 -pkgdesc="A customizable parser/transpiler for SCIM2.0 filters" -url="https://pypi.python.org/project/scim2-filter-parser" -arch="noarch" -license="MIT" -depends="py3-django py3-sly" -checkdepends="py3-pytest" -makedepends="py3-setuptools py3-gpep517 py3-wheel poetry" -source="$pkgname-$pkgver.tar.gz::https://github.com/15five/scim2-filter-parser/archive/refs/tags/$pkgver.tar.gz" -builddir="$srcdir/$_pkgreal-$pkgver" -subpackages="$pkgname-pyc" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest -v -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -5347852af6b82a764a32bc491a7e0f05f06b4f4d93dfa375668b5ca1a15ee58f488702536e350100fe5c96a5c94c492ea8cbd0e1952c5920d5a10e1453357f8c py3-scim2-filter-parser-0.5.0.tar.gz -" From b5286d3c3824b109b18f5ce26d1f6d0e5c6cef65 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 07:26:57 -0400 Subject: [PATCH 09/12] ilot/py3-sentry-sdk: drop due to inclusion in community --- ilot/py3-sentry-sdk/APKBUILD | 60 ------------------------------------ 1 file changed, 60 deletions(-) delete mode 100644 ilot/py3-sentry-sdk/APKBUILD diff --git a/ilot/py3-sentry-sdk/APKBUILD b/ilot/py3-sentry-sdk/APKBUILD deleted file mode 100644 index 3162a03..0000000 --- a/ilot/py3-sentry-sdk/APKBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# Contributor: Francesco Colista -# Maintainer: Francesco Colista -pkgname=py3-sentry-sdk -pkgver=2.14.0 -pkgrel=0 -pkgdesc="The new Python SDK for Sentry.io" -url="https://sentry.io/for/python/" -arch="noarch" -license="BSD-2-Clause" -depends=" - py3-certifi - py3-urllib3 - " -makedepends=" - py3-gpep517 - py3-setuptools - py3-wheel - " -checkdepends=" - py3-executing - py3-jsonschema - py3-pytest-asyncio - py3-pytest-forked - py3-pytest-localserver - py3-pytest-xdist - py3-responses - py3-werkzeug - " -subpackages="$pkgname-pyc" -source="$pkgname-$pkgver.tar.gz::https://github.com/getsentry/sentry-python/archive/$pkgver.tar.gz" -builddir="$srcdir"/sentry-python-$pkgver -options="!check" # a bunch of deprecation-warning failures and improper shutdown.. seems to need net - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - # gcp: pip install - # test_socket/test_requests: needs net - # wsgi: weird list errors - .testenv/bin/python3 -m pytest -n auto -p no:warnings \ - --deselect tests/integrations/gcp/test_gcp.py \ - --deselect tests/integrations/socket/test_socket.py \ - --deselect tests/integrations/requests/test_requests.py \ - --deselect tests/integrations/wsgi/test_wsgi.py -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -8667c3496cdbd6b3055f8046abcf3faa8afbda04e0551787222d44c7736deea95722251c266c21730a73afd57d4b7447ec17408672c3217af35103bba6f4b513 py3-sentry-sdk-2.14.0.tar.gz -" From 178543f2aa7d41aef611e645a7c636e5fe68d60a Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 07:18:37 -0400 Subject: [PATCH 10/12] ilot/uptime-kuma: upgrade to 1.23.15 --- ilot/uptime-kuma/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ilot/uptime-kuma/APKBUILD b/ilot/uptime-kuma/APKBUILD index b54cbc8..f8c48e2 100644 --- a/ilot/uptime-kuma/APKBUILD +++ b/ilot/uptime-kuma/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=uptime-kuma -pkgver=1.23.13 -pkgrel=2 +pkgver=1.23.15 +pkgrel=0 pkgdesc='A fancy self-hosted monitoring tool' arch="all" url="https://github.com/louislam/uptime-kuma" @@ -43,7 +43,7 @@ package() { mv "$pkgdir"/usr/share/webapps/uptime-kuma/LICENSE "$pkgdir"/usr/share/licenses/uptime-kuma/. } sha512sums=" -9045cdc69d46ce34011f7866844a8d1866eee21850be6eede3226e77b9c0d3ecc0190481671f04f25da40345b29cc2d13de07bcc27e7baeff7901b4bd9c8b93f uptime-kuma-1.23.13.tar.gz +eb2210ac27a375e4e7116282436cc98e8c24c9f290e20af69dcb8069bdeca79457e9eb3971982c552b856dc22643a8c9f551723aade18d28cbf93881e3e1b182 uptime-kuma-1.23.15.tar.gz 0ceddb98a6f318029b8bd8b5a49b55c883e77a5f8fffe2b9b271c9abf0ac52dc7a6ea4dbb4a881124a7857f1e43040f18755c1c2a034479e6a94d2b65a73d847 uptime-kuma.openrc 1dbae536b23e3624e139155abbff383bba3209ff2219983da2616b4376b1a5041df812d1e5164716fc6e967a8446d94baae3b96ee575d400813cc6fdc2cc274e uptime-kuma.conf " From 0aabc7bd0cc44a24ee44145ef1562c8cdc563820 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 08:01:08 -0400 Subject: [PATCH 11/12] forgejo: only remove files that already exist --- .forgejo/bin/deploy.sh | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.forgejo/bin/deploy.sh b/.forgejo/bin/deploy.sh index 4d02695..daf2496 100755 --- a/.forgejo/bin/deploy.sh +++ b/.forgejo/bin/deploy.sh @@ -3,7 +3,7 @@ # shellcheck disable=SC3040 set -eu -o pipefail -readonly REPOS="backports ilot" +readonly REPOS="backports user" readonly BASEBRANCH=$GITHUB_BASE_REF readonly TARGET_REPO=$CI_ALPINE_REPO @@ -14,18 +14,12 @@ for apk in $apkgs; do arch=$(echo $apk | awk -F '/' '{print $3}') name=$(echo $apk | awk -F '/' '{print $4}') - # always clear out package before deploying - 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 [ "$(curl -s $GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/pulls/$GITHUB_EVENT_NUMBER | jq .draft)" == "true" ]; then - # if draft, send to -testing branch - branch="$branch-testing" - fi - echo "Sending $name of arch $arch to $TARGET_REPO/$BASEBRANCH/$branch" - curl -s --user $FORGE_REPO_USER:$FORGE_REPO_TOKEN --upload-file $apk $TARGET_REPO/$BASEBRANCH/$branch - + return=$(curl -s --user $FORGE_REPO_USER:$FORGE_REPO_TOKEN --upload-file $apk $TARGET_REPO/$BASEBRANCH/$branch 2>&1) + echo $return + if [ "$return" == "package file already exists" ]; then + echo "Package already exists, refreshing..." + 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 - From 64a3309cbaad6a38643f731daa21e595abe8c774 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 29 Oct 2024 07:12:57 -0400 Subject: [PATCH 12/12] ilot/wikijs: upgrade to 2.5.305 --- ilot/wikijs/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ilot/wikijs/APKBUILD b/ilot/wikijs/APKBUILD index 43d8189..3340f14 100644 --- a/ilot/wikijs/APKBUILD +++ b/ilot/wikijs/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Antoine Martin (ayakael) # Contributor: Antoine Martin (ayakael) pkgname=wikijs -pkgver=2.5.303 -pkgrel=1 +pkgver=2.5.305 +pkgrel=0 pkgdesc="Wiki.js | A modern, lightweight and powerful wiki app built on Node.js" license="AGPL-3.0" arch="!armv7 x86_64" @@ -53,7 +53,7 @@ package() { chown 5494:5494 "$pkgdir"/var/lib/wikijs } sha512sums=" -a463d79ad0d8ff15dbe568b839094d697c6de0b2e991b77a4944e2a82f9789de6840e504a4673e4e0900d61596e880ca276008de86dac4f05f5823dc0427d2fc wikijs-2.5.303.tar.gz +e715e2d93fd176dc93676b3dd97d8dd745589552a7d67971fce0c1097f607fa44a3147534709a82b3ad13dda95d7c5833bc30ec37538c6cdef54ac309e6b44d1 wikijs-2.5.305.tar.gz 355131ee5617348b82681cb8543c784eea59689990a268ecd3b77d44fe9abcca9c86fb8b047f0a8faeba079c650faa7790c5dd65418d313cd7561f38bb590c03 wikijs.initd 07b536c20e370d2a926038165f0e953283259c213a80a8648419565f5359ab05f528ac310e81606914013da212270df6feddb22e514cbcb2464c8274c956e4af config.sample.yml.patch "