From 1d3686c089a67429643320a61267555c8e117ba5 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Wed, 29 Nov 2023 16:54:12 +0100 Subject: [PATCH 01/12] v1.0.5rc --- README.md | 12 ++---------- manifest.toml | 6 +++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 36090c3..182611d 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,4 @@ -# Packaging an app, starting from this example -* Copy this app before working on it, using the ['Use this template'](https://github.com/YunoHost/example_ynh/generate) button on the Github repo. -* Edit the `manifest.json` with app specific info. -* Edit the `install`, `upgrade`, `remove`, `backup`, and `restore` scripts, and any relevant conf files in `conf/`. - * Using the [script helpers documentation.](https://yunohost.org/packaging_apps_helpers) -* Add a `LICENSE` file for the package. -* Edit `doc/DISCLAIMER*.md` -* The `README.md` files are to be automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator --- - -# Example app for YunoHost - -[![Integration level](https://dash.yunohost.org/integration/example.svg)](https://dash.yunohost.org/appci/app/example) ![Working status](https://ci-apps.yunohost.org/ci/badges/example.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/example.maintain.svg) - -[![Install Example app with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=example) - -*[Lire ce readme en français.](./README_fr.md)* - -> *This package allows you to install Example app quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* - -## Overview - -This is a dummy description of this app features - - -**Shipped version:** 1.0~ynh1 - -**Demo:** https://joinfirefish.org/ - -## Screenshots - -![Screenshot of Example app](./doc/screenshots/screenshot-firefish.png) - -## Documentation and resources - -* 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/example_ynh/tree/testing). - -To try the testing branch, please proceed like that. - -``` bash -sudo yunohost app install https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug -or -sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug -``` - -**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md deleted file mode 100644 index 3880bc4..0000000 --- a/README_fr.md +++ /dev/null @@ -1,51 +0,0 @@ - - -# Example app pour YunoHost - -[![Niveau d’intégration](https://dash.yunohost.org/integration/example.svg)](https://dash.yunohost.org/appci/app/example) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/example.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/example.maintain.svg) - -[![Installer Example app avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=example) - -*[Read this readme in english.](./README.md)* - -> *Ce package vous permet d’installer Example app 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.* - -## Vue d’ensemble - -Ceci est une fausse description des fonctionalités de l'app - - -**Version incluse :** 1.0~ynh1 - -**Démo :** https://demo.example.com - -## Captures d’écran - -![Capture d’écran de Example app](./doc/screenshots/example.jpg) - -## Documentations et ressources - -* 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/example_ynh/tree/testing). - -Pour essayer la branche testing, procédez comme suit. - -``` bash -sudo yunohost app install https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug -ou -sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug -``` - -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 37a0ec446efea35ce68f376f2a859d815a5ab74c Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:30:59 +0100 Subject: [PATCH 05/12] Fix --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 3534c4a..d9221c1 100644 --- a/tests.toml +++ b/tests.toml @@ -16,4 +16,4 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.d5f941c.name = "1.0.3" \ No newline at end of file + test_upgrade_from.d5f941c.name = "Firefish v1.0.3" \ No newline at end of file From 0c411b5849804cebe12eae7cee9957270392dbc3 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:33:00 +0100 Subject: [PATCH 06/12] Fix syntax --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index d9221c1..cf9ae22 100644 --- a/tests.toml +++ b/tests.toml @@ -10,7 +10,7 @@ test_format = 1.0 # Default args to use for install # ------------------------------- - exclude = ["change_url" "install.private"] + exclude = ["change_url","install.private"] # ------------------------------- # Commits to test upgrade from From f8732bb9b564d7220cc642537f93155bc162cb14 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:43:44 +0100 Subject: [PATCH 07/12] Add README --- README.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) create mode 100644 README.md create mode 100644 README_fr.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..182611d --- /dev/null +++ b/README.md @@ -0,0 +1,54 @@ + + +--- + + +# Example app for YunoHost + +[![Integration level](https://dash.yunohost.org/integration/example.svg)](https://dash.yunohost.org/appci/app/example) ![Working status](https://ci-apps.yunohost.org/ci/badges/example.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/example.maintain.svg) + +[![Install Example app with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=example) + +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install Example app quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* + +## Overview + +This is a dummy description of this app features + + +**Shipped version:** 1.0~ynh1 + +**Demo:** https://joinfirefish.org/ + +## Screenshots + +![Screenshot of Example app](./doc/screenshots/screenshot-firefish.png) + +## Documentation and resources + +* 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/example_ynh/tree/testing). + +To try the testing branch, please proceed like that. + +``` bash +sudo yunohost app install https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug +or +sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug +``` + +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..3880bc4 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,51 @@ + + +# Example app pour YunoHost + +[![Niveau d’intégration](https://dash.yunohost.org/integration/example.svg)](https://dash.yunohost.org/appci/app/example) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/example.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/example.maintain.svg) + +[![Installer Example app avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=example) + +*[Read this readme in english.](./README.md)* + +> *Ce package vous permet d’installer Example app 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.* + +## Vue d’ensemble + +Ceci est une fausse description des fonctionalités de l'app + + +**Version incluse :** 1.0~ynh1 + +**Démo :** https://demo.example.com + +## Captures d’écran + +![Capture d’écran de Example app](./doc/screenshots/example.jpg) + +## Documentations et ressources + +* 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/example_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. + +``` bash +sudo yunohost app install https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug +ou +sudo yunohost app upgrade example -u https://github.com/YunoHost-Apps/example_ynh/tree/testing --debug +``` + +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 03389a3ecb5603599ee88e8fef8f490e33321ce4 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Thu, 30 Nov 2023 13:18:05 +0100 Subject: [PATCH 08/12] Fix restore --- scripts/restore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/restore b/scripts/restore index 017bdf9..66ab649 100755 --- a/scripts/restore +++ b/scripts/restore @@ -38,6 +38,8 @@ ynh_script_progression --message="Reinstalling pnpm..." --weight=1 # Define and install pnpm pushd "$install_dir" + curl https://sh.rustup.rs -sSf | ynh_exec_warn_less ynh_exec_as $app sh -s -- -y + export PATH="$install_dir/.cargo/bin:$PATH" ynh_use_nodejs corepack enable corepack prepare pnpm@latest --activate From 995d7acf4b155868ddac9c2da650b73e940b6666 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Thu, 30 Nov 2023 16:24:45 +0100 Subject: [PATCH 09/12] NodeJS v21 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 6d92371..74f9474 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ # PHP APP SPECIFIC #================================================= -NODEJS_VERSION="20" +NODEJS_VERSION="21" #================================================= # PERSONAL HELPERS From 71f5e5bc6455da6350a90ccba30dd8e1d6bb207f Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Thu, 30 Nov 2023 18:08:37 +0100 Subject: [PATCH 10/12] Fix upgrade remove clean-all --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9b76686..9a4455c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,7 +95,6 @@ pushd "$install_dir" ynh_use_nodejs corepack enable corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm clean-all ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate From 2173a9627c0a192c0d764419c7dbd6f2d0cb1846 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Thu, 30 Nov 2023 18:49:28 +0100 Subject: [PATCH 11/12] Remove install.private --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index cf9ae22..ac84bce 100644 --- a/tests.toml +++ b/tests.toml @@ -10,7 +10,7 @@ test_format = 1.0 # Default args to use for install # ------------------------------- - exclude = ["change_url","install.private"] + exclude = ["change_url"] # ------------------------------- # Commits to test upgrade from From fa76cdbd982241143da31ce7848c7c666c26dee2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 30 Nov 2023 19:10:12 +0000 Subject: [PATCH 12/12] Auto-update README --- README.md | 5 ++--- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1744e7e..0a9b5e6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -