From 5c00fdf976a692ac1e0af7fddcb74e08a3f46b64 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 29 Feb 2024 23:58:33 +0100 Subject: [PATCH 1/4] Update make_changelog.sh --- maintenance/make_changelog.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintenance/make_changelog.sh b/maintenance/make_changelog.sh index 866a815b7..36e9f2539 100644 --- a/maintenance/make_changelog.sh +++ b/maintenance/make_changelog.sh @@ -2,8 +2,8 @@ VERSION="?" RELEASE="testing" REPO=$(basename $(git rev-parse --show-toplevel)) REPO_URL=$(git remote get-url origin) -ME=$(git config --global --get user.name) -EMAIL=$(git config --global --get user.email) +ME=$(git config --get user.name) +EMAIL=$(git config --get user.email) LAST_RELEASE=$(git tag --list 'debian/11.*' --sort="v:refname" | tail -n 1) From 4759ff66a7c93df2f654c11086585131744ad61d Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Fri, 1 Mar 2024 00:24:54 +0100 Subject: [PATCH 2/4] 11.2.10.3 --- debian/changelog | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f665626da..c9e3537d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,12 @@ -yunohost (11.2.10.2) testing; urgency=low +yunohost (11.2.10.3) stable; urgency=low + + - fix: latest release was tagged 'testing' by error + + Thanks to all contributors <3 ! (Alexandre Aubin, Tagada, OniriCorpe) + + -- OniriCorpe Thu, 29 Feb 2024 23:49:11 +0100 + +yunohost (11.2.10.2) stable; urgency=low - docs: add autoupdate.version_regex to the doc ([#1781](http://github.com/YunoHost/yunohost/pull/1781)) - chores: update actions/checkout & peter-evans/create-pull-request to nodejs20 ([#1784](http://github.com/YunoHost/yunohost/pull/1784)) From 56d949bb9e3a1f9d9f817fcb9c83fee9f77b89ac Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Fri, 1 Mar 2024 01:48:42 +0100 Subject: [PATCH 3/4] remove "co-authored" lines --- maintenance/make_changelog.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/maintenance/make_changelog.sh b/maintenance/make_changelog.sh index 36e9f2539..9a5781c27 100644 --- a/maintenance/make_changelog.sh +++ b/maintenance/make_changelog.sh @@ -12,6 +12,7 @@ echo "" git log $LAST_RELEASE.. -n 10000 --first-parent --pretty=tformat:' - %b%s (%h)' \ | sed -E "s&Merge .*#([0-9]+).*\$& \([#\1]\(http://github.com/YunoHost/$REPO/pull/\1\)\)&g" \ +| sed -E "/Co-authored-by: .* <.*>/d" \ | grep -v "Translations update from Weblate" \ | tac From 105f4dc515cb00d7d8f809848b8b76dd992ac7dc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 1 Mar 2024 02:10:08 +0000 Subject: [PATCH 4/4] [CI] Format code with Black --- src/utils/resources.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/resources.py b/src/utils/resources.py index 166be46f2..ac4e2de12 100644 --- a/src/utils/resources.py +++ b/src/utils/resources.py @@ -350,13 +350,13 @@ class SourcesResource(AppResource): It is also possible to define `autoupdate.upstream` to use a different Git repository instead of the code repository from the upstream section of the manifest. This can be useful when, for example, the app uses other assets such as plugin from a different repository. - If the upstream project provides non-standard tag or release names, you can fix this, with a regex with a matching group. + If the upstream project provides non-standard tag or release names, you can fix this, with a regex with a matching group. For example, if tags look like `release-v4.1`, put: ```toml autoupdate.version_regex = "^release-v(.*)$" ``` - + And the autoupdater will use the matched group (here: `4.1`) as the version. ##### Provision/Update