From d54ae0388e9c2b899253e092fb8ebd212cf42521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 17 Apr 2021 16:12:35 +0200 Subject: [PATCH] Testing (#49) * Cleaning up --- README.md | 6 +++--- check_process | 9 +++------ pull_request_template.md | 12 ++---------- scripts/backup | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 9 +-------- 7 files changed, 12 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 036de97..4b3fe04 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # AgenDAV for YunoHost [![Integration level](https://dash.yunohost.org/integration/agendav.svg)](https://dash.yunohost.org/appci/app/agendav) ![](https://ci-apps.yunohost.org/ci/badges/agendav.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/agendav.maintain.svg) -[![Install AgenDAV with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=agendav) +[![Install AgenDAV with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=agendav) > *This package allow you to install AgenDAV quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* @@ -31,8 +31,8 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/agendav%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/agendav/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/agendav%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/agendav/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/agendav.svg)](https://ci-apps.yunohost.org/ci/apps/agendav/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/agendav.svg)](https://ci-apps-arm.yunohost.org/ci/apps/agendav/) ## Limitations diff --git a/check_process b/check_process index 3d9f5a3..bb25a96 100644 --- a/check_process +++ b/check_process @@ -16,18 +16,15 @@ setup_private=1 setup_public=0 upgrade=1 - upgrade=1 from_commit=1783f57896e46ed8b117f2748340c02d37b2a014 + upgrade=1 from_commit=6fb29ddc7e32549b5587405e520d46a717e5582e backup_restore=1 multi_instance=0 - incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none ;;; Upgrade options - ; commit=1783f57896e46ed8b117f2748340c02d37b2a014 - name= Fix installation on root - Sep 10, 2018 + ; commit=6fb29ddc7e32549b5587405e520d46a717e5582e + name= --admin-password ain't needed since like 2 years or so manifest_arg=domain=DOMAIN&path=PATH&language=en& diff --git a/pull_request_template.md b/pull_request_template.md index b7ba501..0a198cf 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,14 +11,6 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -*Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/agendav_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/agendav_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!"* diff --git a/scripts/backup b/scripts/backup index affe443..323928f 100644 --- a/scripts/backup +++ b/scripts/backup @@ -36,7 +36,7 @@ ynh_print_info --message="Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_script_progression --message="Backing up AgenDAV directory..." +ynh_print_info --message="Backing up AgenDAV directory..." # Clean cache files before backup ynh_secure_remove --file=${final_path}/web/var/cache/profiler diff --git a/scripts/install b/scripts/install index e17932c..f7b27a8 100644 --- a/scripts/install +++ b/scripts/install @@ -104,7 +104,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring PHP-FPM.." # Copy and set PHP-FPM configuration -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/restore b/scripts/restore index 7dde0df..d554f25 100644 --- a/scripts/restore +++ b/scripts/restore @@ -82,7 +82,7 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index 697a723..3053783 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -92,13 +92,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 #================================================= @@ -135,7 +128,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # SPECIFIC SETUP