From f70eb5c457443e8c0fbd72cb1d197d3f33382099 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 2 Dec 2023 16:56:30 +0000 Subject: [PATCH 1/7] Auto-update README --- README_fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index 0fd0ec5..dca2d98 100755 --- a/README_fr.md +++ b/README_fr.md @@ -31,9 +31,9 @@ Castopod est une plate-forme d'hébergement gratuite et open source conçue pour - Multi-locataire : hébergez autant de podcasts que vous le souhaitez - Multi-utilisateur : ajouter des contributeurs et définir des rôles -**Version incluse :** 1.7.1~ynh2 +**Version incluse :** 1.7.1~ynh2 -**Démo :** https://podcast.podlibre.org/@podlibre_fr +**Démo :** https://podcast.podlibre.org/@podlibre_fr ## Captures d’écran From 5ec2b774aa0bfbf5a7467c63fb3cdc3427b58586 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 3 Dec 2023 13:04:53 +0100 Subject: [PATCH 2/7] Revert "Revert "Update manifest.toml"" This reverts commit 520e261413a97b1daaebf6d8ea9f2fd6d55ae4e5. --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3b6ed70..0a0c5ed 100755 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Castopod is easy to install and was built on top of CodeIgniter4, a powerful PHP - Multi-tenant: host as many podcasts as you want - Multi-user: add contributors and set roles -**Shipped version:** 1.7.1~ynh2 +**Shipped version:** 1.7.1~ynh3 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index 0fd0ec5..ee69519 100755 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ Castopod est une plate-forme d'hébergement gratuite et open source conçue pour - Multi-locataire : hébergez autant de podcasts que vous le souhaitez - Multi-utilisateur : ajouter des contributeurs et définir des rôles -**Version incluse :** 1.7.1~ynh2 +**Version incluse :** 1.7.1~ynh3 **Démo :** https://podcast.podlibre.org/@podlibre_fr diff --git a/manifest.toml b/manifest.toml index a37b2e8..5bc1699 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Castopod" description.en = "Hosting platform made for podcasters" description.fr = "Plateforme d'hébergement conçue pour les podcasteurs" -version = "1.7.1~ynh2" +version = "1.7.1~ynh3" maintainers = ["eric_G"] @@ -20,8 +20,11 @@ code = "https://code.castopod.org/adaures/castopod" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "150M" ram.runtime = "50M" @@ -39,8 +42,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://code.castopod.org/adaures/castopod/uploads/fe7be588c53a9e1ed63af47e6e624ad1/castopod-1.6.5.zip" - sha256 = "3618afa82605dda4f791efe5bb312d1fab3c4b0d702086f9cb75e57d627b6306" + url = "https://code.castopod.org/adaures/castopod/uploads/957f673c5f2f55aea9914e213a753845/castopod-1.7.1.zip" + sha256 = "ac97e620bf936ae1d53884ebdd3c43802f072c6316806ffd9b802f99c3922537" in_subdir = true [resources.system_user] From 45dedb417e18abb813ad3cb55351c44a73caff9d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 3 Dec 2023 12:04:59 +0000 Subject: [PATCH 3/7] Auto-update README --- README_fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index ee69519..ff317b3 100755 --- a/README_fr.md +++ b/README_fr.md @@ -31,9 +31,9 @@ Castopod est une plate-forme d'hébergement gratuite et open source conçue pour - Multi-locataire : hébergez autant de podcasts que vous le souhaitez - Multi-utilisateur : ajouter des contributeurs et définir des rôles -**Version incluse :** 1.7.1~ynh3 +**Version incluse :** 1.7.1~ynh3 -**Démo :** https://podcast.podlibre.org/@podlibre_fr +**Démo :** https://podcast.podlibre.org/@podlibre_fr ## Captures d’écran From fff9e22599acf31c703feef9052ce963adc77390 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 3 Dec 2023 13:39:58 +0100 Subject: [PATCH 4/7] Fixed source provisioning --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8743ae1..571aff7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers # CHECK VERSION #================================================= -upgrade_type=$(ynh_check_app_version_changed) +upgrade_type=$(ynh_check_app_version_changed) #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -62,7 +62,7 @@ fi # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -if [ "$upgrade_type" == "UPGRADE_APP" ] +if [ "$upgrade_type" == "UPGRADE_APP" || $(ynh_compare_current_package_version --comparison le --version "1.7.1~ynh2")] then ynh_script_progression --message="Upgrading source files..." --weight=1 From 7d99542c26491c7c36ff390b0042a0caf244324a Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 3 Dec 2023 13:48:43 +0100 Subject: [PATCH 5/7] Take 2 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 571aff7..631d630 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -62,7 +62,7 @@ fi # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -if [ "$upgrade_type" == "UPGRADE_APP" || $(ynh_compare_current_package_version --comparison le --version "1.7.1~ynh2")] +if [ "$upgrade_type" == "UPGRADE_APP" ] || ynh_compare_current_package_version --comparison le --version "1.7.1~ynh2" then ynh_script_progression --message="Upgrading source files..." --weight=1 From 37e87f6e714fb015701870a06dff81951cf4e94c Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 3 Dec 2023 13:56:07 +0100 Subject: [PATCH 6/7] Actually check version --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 631d630..6b62528 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -62,7 +62,7 @@ fi # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -if [ "$upgrade_type" == "UPGRADE_APP" ] || ynh_compare_current_package_version --comparison le --version "1.7.1~ynh2" +if [ "$upgrade_type" == "UPGRADE_APP" ] || ynh_compare_current_package_version --comparison eq --version "1.7.1~ynh2" then ynh_script_progression --message="Upgrading source files..." --weight=1 From 7fb9add684087754d47713090955ac26d3e416da Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sun, 3 Dec 2023 17:05:03 +0100 Subject: [PATCH 7/7] Update upgrade --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6b62528..a95bd4e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers # CHECK VERSION #================================================= -upgrade_type=$(ynh_check_app_version_changed) +upgrade_type=$(ynh_check_app_version_changed) #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -62,6 +62,8 @@ fi # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +# 1.7.1~ynh2 accidently shipped 1.6.5, force upgrade on that version even if it's theoretically the same upstream release + if [ "$upgrade_type" == "UPGRADE_APP" ] || ynh_compare_current_package_version --comparison eq --version "1.7.1~ynh2" then ynh_script_progression --message="Upgrading source files..." --weight=1