From f8ca3f64c926e3cc0ad1a47ae964886b71485567 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Tue, 12 Jul 2022 21:29:37 +0200 Subject: [PATCH 1/6] Update api.src --- conf/api.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/api.src b/conf/api.src index 4a5d464..591f91a 100644 --- a/conf/api.src +++ b/conf/api.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.2.5/download?job=build_api -SOURCE_SUM=c941c7aefa6bbacdec246f3af2b2b3f86c47892138835d20fca2acbff71dbaaa +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.2.6-1/download?job=build_api +SOURCE_SUM=789ede99df07cd7a2a1ae511a768c1f5b3a15900edecb0612916eea40127d62a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=api_1.2.5.zip +SOURCE_FILENAME=api_1.2.6-1.zip SOURCE_EXTRACT=true From e81cdc102323a1024df50f09b8f2033f0944cba1 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Tue, 12 Jul 2022 21:31:07 +0200 Subject: [PATCH 2/6] Update front.src --- conf/front.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/front.src b/conf/front.src index 4dfd236..5a3c83f 100644 --- a/conf/front.src +++ b/conf/front.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.2.5/download?job=build_front -SOURCE_SUM=cb1df2630ab4818250d4363d43600258bdb33f21622b4c58d9cad6589e95b3ae +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.2.6-1/download?job=build_front +SOURCE_SUM=ecd0b32888f95eae77aea9ead32ffa820c30a3667d81ab737f85da85fc0b1c43 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=front_1.2.5.zip +SOURCE_FILENAME=front_1.2.6-1.zip SOURCE_EXTRACT=true From a142b1b8c23cee9d29fc11b0a82bd508d6201231 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Tue, 12 Jul 2022 21:31:52 +0200 Subject: [PATCH 3/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 92f2e3a..0bd4289 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern, convivial and free music server", "fr": "Serveur de musique moderne, convivial et gratuit" }, - "version": "1.2.5~ynh1", + "version": "1.2.6~ynh1", "url": "https://funkwhale.audio", "upstream": { "license": "AGPL-3.0-or-later", From e470f59c3dc14554f53f71699fba1c1220b3ed83 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Tue, 12 Jul 2022 21:32:20 +0200 Subject: [PATCH 4/6] Update check_process --- check_process | 5 ----- 1 file changed, 5 deletions(-) diff --git a/check_process b/check_process index d531f2c..4ff2c89 100644 --- a/check_process +++ b/check_process @@ -11,8 +11,6 @@ setup_private=1 setup_public=1 upgrade=1 - # 0.19.1 - upgrade=1 from_commit=4d4bf0981e2d3a00eaae6b19bd54344fe55d6530 # 1.1~ynh1 upgrade=1 from_commit=8172790fb461d16f09089593fdac380f0d499c83 # 1.1.1~ynh1 @@ -37,9 +35,6 @@ Email=cda@rootkey.co.uk Notification=all ;;; Upgrade options - ; commit=4d4bf0981e2d3a00eaae6b19bd54344fe55d6530 - name=Upgrade to 0.19.1 and fix channels-redis bug - manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1 ; commit=8172790fb461d16f09089593fdac380f0d499c83 name=1.1~ynh1 ; commit=fa9587f61e4bb4f9db8667b1c6701ede37ac8e91 From 304cc41deedbfba4c9d46345ef811f58ebd8a08f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 13 Jul 2022 15:29:01 +0000 Subject: [PATCH 5/6] Auto-update README --- README.md | 23 ++++++++++++----------- README_fr.md | 29 +++++++++++++++++------------ 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 8d41f71..4b12878 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Funkwhale for YunoHost -[![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![Working status](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg) [![Install Funkwhale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=funkwhale) *[Lire ce readme en français.](./README_fr.md)* @@ -17,13 +17,13 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Funkwhale is a community-driven project that lets you listen and share music and audio within a decentralized, open network. -**Shipped version:** 1.2.5~ynh1 +**Shipped version:** 1.2.6~ynh1 **Demo:** https://demo.funkwhale.audio ## Screenshots -![](./doc/screenshots/screenshot1.png) +![Screenshot of Funkwhale](./doc/screenshots/screenshot1.png) ## Disclaimers / important information @@ -43,22 +43,23 @@ The files can then be added to your library from the *uploading* tab in a music ## Documentation and resources -* Official app website: https://funkwhale.audio/ -* Official user documentation: https://docs.funkwhale.audio/users/index.html -* Official admin documentation: https://docs.funkwhale.audio/admin/index.html -* Upstream app code repository: https://dev.funkwhale.audio/funkwhale/funkwhale -* YunoHost documentation for this app: https://yunohost.org/app_funkwhale -* Report a bug: https://github.com/YunoHost-Apps/funkwhale_ynh/issues +* Official app website: +* Official user documentation: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing --debug or sudo yunohost app upgrade funkwhale -u https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index e62a129..6e5e84d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Funkwhale pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg) [![Installer Funkwhale avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=funkwhale) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Funkwhale rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -13,13 +17,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Funkwhale est un projet communautaire qui vous permet d'écouter et de partager de la musique et de l'audio au sein d'un réseau ouvert et décentralisé. -**Version incluse :** 1.2.5~ynh1 +**Version incluse :** 1.2.6~ynh1 **Démo :** https://demo.funkwhale.audio ## Captures d'écran -![](./doc/screenshots/screenshot1.png) +![Capture d'écran de Funkwhale](./doc/screenshots/screenshot1.png) ## Avertissements / informations importantes @@ -36,22 +40,23 @@ Les fichiers peuvent ensuite être ajoutés à votre bibliothèque à partir de ## Documentations et ressources -* Site officiel de l'app : https://funkwhale.audio/ -* Documentation officielle utilisateur : https://docs.funkwhale.audio/users/index.html -* Documentation officielle de l'admin : https://docs.funkwhale.audio/admin/index.html -* Dépôt de code officiel de l'app : https://dev.funkwhale.audio/funkwhale/funkwhale -* Documentation YunoHost pour cette app : https://yunohost.org/app_funkwhale -* Signaler un bug : https://github.com/YunoHost-Apps/funkwhale_ynh/issues +* Site officiel de l'app : +* Documentation officielle utilisateur : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing --debug ou sudo yunohost app upgrade funkwhale -u https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 5cbb74d6bb1aabc8bfb53d1a62c5f1a2601ace4e Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 14 Jul 2022 10:43:11 +0200 Subject: [PATCH 6/6] Forgot to add last upgrade --- check_process | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/check_process b/check_process index 4ff2c89..a613ac3 100644 --- a/check_process +++ b/check_process @@ -27,6 +27,8 @@ upgrade=1 from_commit=1c1b64b8b04ee917a63580dce21d149182ee319d # 1.2.4~ynh1 upgrade=1 from_commit=5961e7283e52963329e30ca22df4d5505adfc256 + #1.2.5~ynh1 + upgrade=1 from_commit=a070baf105a94ac6fefc280f0335b044db643ec8 backup_restore=1 multi_instance=1 port_already_use=0 @@ -51,3 +53,5 @@ Notification=all name=1.2.3~ynh1 ; commit=5961e7283e52963329e30ca22df4d5505adfc256 name=1.2.4~ynh1 + ; commit=a070baf105a94ac6fefc280f0335b044db643ec8 + name=1.2.5~ynh1