From 23f3b827582c10413897b82f746bdb73753f0f1a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Dec 2020 12:36:06 +0100 Subject: [PATCH 01/11] Fix linter warning --- README.md | 3 +-- check_process | 3 --- manifest.json | 2 +- scripts/backup | 1 - scripts/change_url | 14 +++++++------- scripts/install | 6 +++--- scripts/remove | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 13 +++---------- 9 files changed, 19 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index ce2385a..0e67939 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,7 @@ An addictive puzzle game inspired by Tetris. --- -Developer info ----------------- +## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/hextris_ynh/tree/testing). diff --git a/check_process b/check_process index 269b52f..4a3b94e 100644 --- a/check_process +++ b/check_process @@ -15,11 +15,8 @@ upgrade=1 from_commit=ec4da0af3abbd7b8bd59d5f7d9d7c594ae844ac0 backup_restore=1 multi_instance=1 - incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/manifest.json b/manifest.json index c7c8481..a8720c1 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "aeris@e.email" }, "requirements": { - "yunohost": ">= 3.7.1" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ diff --git a/scripts/backup b/scripts/backup index be2b013..87e89d3 100755 --- a/scripts/backup +++ b/scripts/backup @@ -30,7 +30,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= - ynh_print_info --message="Declaring files to be backed up..." #================================================= diff --git a/scripts/change_url b/scripts/change_url index 3635e04..1160e7e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -50,23 +50,23 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=2 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location @@ -81,7 +81,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index b31ecb7..c5cfa22 100755 --- a/scripts/install +++ b/scripts/install @@ -60,9 +60,9 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=2 +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -89,7 +89,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 7d0a65d..5a76e4b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -32,9 +32,9 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=2 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=2 -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= diff --git a/scripts/restore b/scripts/restore index 0c6c38d..69d98c5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -43,7 +43,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the nginx configuration..." --weight=1 +ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -59,7 +59,7 @@ ynh_restore_file --origin_path="$final_path" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index fa4a9dd..279396a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,13 +68,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -92,9 +85,9 @@ fi #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=2 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -109,7 +102,7 @@ chown -R root: $final_path #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload From 1c988939be181ffb00cdacc3ec24ae143507c2b5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 9 Dec 2020 08:56:58 +0100 Subject: [PATCH 02/11] Add README_fr --- README.md | 4 +++- README_fr.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ manifest.json | 2 +- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index 0e67939..ef7c7e6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ -# Hextris app for YunoHost +# Hextris for YunoHost [![Integration level](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) [![Install Hextris with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hextris) +*[Lire ce readme en français.](./README_fr.md)* + > *This package allows you to install Hextris 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.* diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..a5fde97 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,48 @@ +# Hextris for YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) +[![Installer Hextris avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hextris) + +*[Read this readme in english.](./README.md)* + +> *Ce package vous permet d'installer Hextris rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* + +## Vue d'ensemble +Un puzzle addictif inspiré de Tetris. + +**Version incluse :** 2020-05-05 + +## Captures d'écran + +![](https://raw.githubusercontent.com/YunoHost-Apps/hextris_ynh/master/screenshot.jpg) + +## Démo + +* [Démo officielle](http://hextris.io/) +* [Démo YunoHost](https://demo.yunohost.org/hextris/) + +#### Architectures supportées + +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/hextris%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/hextris/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/hextris%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/hextris/) + +## Liens + + * Signaler un bug : https://github.com/YunoHost-Apps/hextris_ynh/issues + * Site de l'application : http://hextris.github.io/ + * Dépôt de l'application principale : https://github.com/Hextris/Hextris + * Site web YunoHost : https://yunohost.org/ + +--- + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/hextris_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug +ou +sudo yunohost app upgrade hextris -u https://github.com/YunoHost-Apps/hextris_ynh/tree/testing --debug +``` diff --git a/manifest.json b/manifest.json index a8720c1..842e874 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A fast paced puzzle game.", "fr": "Un jeu de puzzle très rapide" }, - "version": "2020-05-05~ynh1", + "version": "2020-05-05~ynh2", "url": "http://hextris.github.io/", "license": "GPL-3.0", "maintainer": { From edd643799b20649b37bcc1cf21b9266e3b50b745 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 9 Dec 2020 09:31:36 +0100 Subject: [PATCH 03/11] Update README_fr.md --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index a5fde97..15b3e0a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,4 +1,4 @@ -# Hextris for YunoHost +# Hextris pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) [![Installer Hextris avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hextris) From e01790ad14a850af8d9412021668bea81b3dbad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Dec 2020 22:58:24 +0100 Subject: [PATCH 04/11] Set badge in SVG --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef7c7e6..8065643 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Hextris for YunoHost [![Integration level](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) -[![Install Hextris with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hextris) +[![Install Hextris with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris) *[Lire ce readme en français.](./README_fr.md)* From 2f185c487080af76055879bf89692b2960fea2a3 Mon Sep 17 00:00:00 2001 From: gmilad <61253440+gmilad@users.noreply.github.com> Date: Sat, 30 Jan 2021 08:11:12 +0100 Subject: [PATCH 05/11] Rajout de la partie Documentation (#24) Rajout de la partie Documentation avec les liens vers les pages de documentations officiels ainsi que celle de YunoHost en lien avec l'application. --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 8065643..758e4a4 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,12 @@ An addictive puzzle game inspired by Tetris. * [Official demo](http://hextris.io/) * [YunoHost demo](https://demo.yunohost.org/hextris/) +## Documentation + + * Official documentation: https://github.com/Hextris/Hextris + * YunoHost documentation: https://yunohost.org/#/app_hextris + + #### Supported architectures * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/hextris%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/hextris/) From 83a374161ff9cf17704b13852fba92586a1245ad Mon Sep 17 00:00:00 2001 From: gmilad <61253440+gmilad@users.noreply.github.com> Date: Sat, 30 Jan 2021 08:12:28 +0100 Subject: [PATCH 06/11] Rajout de la partie Documentation (#23) (README_fr.md) Rajout de la partie Documentation avec les liens vers les pages de documentations officiels ainsi que celle de YunoHost en lien avec l'application. --- README_fr.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README_fr.md b/README_fr.md index 15b3e0a..2f2a6c6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,6 +22,12 @@ Un puzzle addictif inspiré de Tetris. * [Démo officielle](http://hextris.io/) * [Démo YunoHost](https://demo.yunohost.org/hextris/) +## Documentation + + * Documentation officielle : https://github.com/Hextris/Hextris + * Documentation YunoHost : https://yunohost.org/#/app_hextris + + #### Architectures supportées * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/hextris%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/hextris/) From ce88bf8c9c2b0d2daef1ec8010ccaddb32e4f965 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 15 Mar 2021 00:21:48 +0100 Subject: [PATCH 07/11] [autopatch] Missing ynh_abort_if_errors in change_url scripts --- scripts/change_url | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/change_url b/scripts/change_url index 1160e7e..8cc1e30 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -8,6 +8,7 @@ source _common.sh source /usr/share/yunohost/helpers +ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS From fb6e82b04bc19b3156a27c63868a3864a90d66d1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 18 Mar 2021 18:50:49 +0100 Subject: [PATCH 08/11] Fix linter warnings --- README.md | 2 +- README_fr.md | 4 ++-- manifest.json | 14 +------------- scripts/change_url | 18 +++++++++++++++++- scripts/install | 5 ++--- scripts/upgrade | 3 +-- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 758e4a4..e7e27d4 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ An addictive puzzle game inspired by Tetris. ## Documentation * Official documentation: https://github.com/Hextris/Hextris - * YunoHost documentation: https://yunohost.org/#/app_hextris + * YunoHost documentation: https://yunohost.org/en/app_hextris #### Supported architectures diff --git a/README_fr.md b/README_fr.md index 2f2a6c6..2b384ab 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Hextris pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/hextris.svg)](https://dash.yunohost.org/appci/app/hextris) ![](https://ci-apps.yunohost.org/ci/badges/hextris.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/hextris.maintain.svg) -[![Installer Hextris avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=hextris) +[![Installer Hextris avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=hextris) *[Read this readme in english.](./README.md)* @@ -25,7 +25,7 @@ Un puzzle addictif inspiré de Tetris. ## Documentation * Documentation officielle : https://github.com/Hextris/Hextris - * Documentation YunoHost : https://yunohost.org/#/app_hextris + * Documentation YunoHost : https://yunohost.org/fr/app_hextris #### Architectures supportées diff --git a/manifest.json b/manifest.json index 842e874..3b8a531 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "aeris@e.email" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ @@ -25,29 +25,17 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain for Hextris", - "fr": "Choisissez un domaine pour Hextris" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Hextris", - "fr": "Choisissez un chemin pour Hextris" - }, "example": "/hextris", "default": "/hextris" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, "help": { "en": "If enabled, Hextris will be accessible by people who doesn't have an account. This can be changed later via the webadmin.", "fr": "Si cette case est cochée, Hextris sera accessible aux personnes n'ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." diff --git a/scripts/change_url b/scripts/change_url index 8cc1e30..2480b7f 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -8,7 +8,6 @@ source _common.sh source /usr/share/yunohost/helpers -ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS @@ -30,6 +29,23 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. + ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + + # Restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= diff --git a/scripts/install b/scripts/install index c5cfa22..d17e38f 100755 --- a/scripts/install +++ b/scripts/install @@ -44,7 +44,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # STANDARD MODIFICATIONS @@ -78,12 +77,12 @@ chown -R root: $final_path #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add visitors + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 279396a..93506a0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,14 +46,13 @@ if [ -n "$is_public" ]; then if ynh_permission_has_user --permission=main --user=visitors then ynh_app_setting_delete --app=$app --key=skipped_uris - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" else ynh_app_setting_delete --app=$app --key=skipped_uris fi ynh_app_setting_delete --app=$app --key=is_public fi - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= From e3f8f5b4353dd02b8eeeb91f25a86e15ca7d95f9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 18 Mar 2021 19:12:14 +0100 Subject: [PATCH 09/11] Update upgrade --- scripts/upgrade | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 93506a0..8e535ce 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -37,19 +37,10 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi -# Migrate from legacy permission system -is_public=$(ynh_app_setting_get --app=$app --key=is_public) +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all -if [ -n "$is_public" ]; then - # Removing skipped/unprotected_uris under certain conditions, remove the visitors group added during the migration process of 3.7 - # Remove skipped_uris. If the app was public, add visitors again to the main permission - if ynh_permission_has_user --permission=main --user=visitors - then - ynh_app_setting_delete --app=$app --key=skipped_uris - ynh_permission_update --permission="main" --add="visitors" - else - ynh_app_setting_delete --app=$app --key=skipped_uris - fi ynh_app_setting_delete --app=$app --key=is_public fi From 9392c22cde742b2f697360a3f66f42057aca6994 Mon Sep 17 00:00:00 2001 From: Aeris One Date: Tue, 23 Mar 2021 09:42:48 +0100 Subject: [PATCH 10/11] Bump version number --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 3b8a531..8986440 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A fast paced puzzle game.", "fr": "Un jeu de puzzle très rapide" }, - "version": "2020-05-05~ynh2", + "version": "2020-05-05~ynh3", "url": "http://hextris.github.io/", "license": "GPL-3.0", "maintainer": { From 1cddd816878b2c22564eb0c7857b3925b6a85c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 22 Apr 2021 09:24:12 +0200 Subject: [PATCH 11/11] Fix badges (#28) --- README.md | 4 ++-- README_fr.md | 4 ++-- pull_request_template.md | 10 ++-------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e7e27d4..618750f 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ An addictive puzzle game inspired by Tetris. #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/hextris%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/hextris/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/hextris%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/hextris/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/hextris.svg)](https://ci-apps.yunohost.org/ci/apps/hextris/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/hextris.svg)](https://ci-apps-arm.yunohost.org/ci/apps/hextris/) ## Links diff --git a/README_fr.md b/README_fr.md index 2b384ab..4767895 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,8 +30,8 @@ Un puzzle addictif inspiré de Tetris. #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/hextris%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/hextris/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/hextris%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/hextris/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/hextris.svg)](https://ci-apps.yunohost.org/ci/apps/hextris/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/hextris.svg)](https://ci-apps-arm.yunohost.org/ci/apps/hextris/) ## Liens diff --git a/pull_request_template.md b/pull_request_template.md index 64b71a8..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,12 +11,6 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -*Code review and approval have to be from a member of @YunoHost-Apps/apps-group* -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/hextris_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/hextris_ynh%20PR-NUM-/) -*Please replace '-NUM-' in this link by the PR number.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*