From 69a532545465d0d5b3bb9f4c6e6dbcf014a0532c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 06:53:42 +0200 Subject: [PATCH 1/5] backup configuration before upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d23d90b..291395c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -130,6 +130,7 @@ ynh_install_composer --phpversion="7.2" --workdir="$final_path/.composer" #================================================= ynh_print_info --message="Updating Drupal..." +ynh_backup_if_checksum_is_different --file="$final_path/$app/sites/default/settings.php" export PATH="$final_path/.composer/vendor/bin:$PATH" sudo -u $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 1 @@ -150,7 +151,6 @@ sudo -u $app env PATH=$PATH drush @$app vset --exact maintenance_mode 0 # STORE THE CONFIG FILE CHECKSUM #================================================= -ynh_backup_if_checksum_is_different --file="$final_path/$app/sites/default/settings.php" # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum --file="$final_path/$app/sites/default/settings.php" From f8ed0b53990620fc5bb4c3df0da1efc8326003ee Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 06:54:29 +0200 Subject: [PATCH 2/5] Spelling --- scripts/upgrade | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 291395c..1117929 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -110,25 +110,25 @@ ynh_add_fpm_config --phpversion="7.2" #================================================= # SPECIFIC UPGRADE #================================================= -# UPDATE thread_stack +# UPGRADE THREAD_STACK #================================================= -ynh_print_info --message="Updating thread_stack..." +ynh_print_info --message="Upgrading thread_stack..." ynh_replace_string --match_string="thread_stack = 128K" --replace_string="thread_stack = 192K" --target_file="/etc/mysql/my.cnf" ynh_systemd_action --service_name=mysql --action="restart" #================================================= -# UPDATE COMPOSER +# UPGRADE COMPOSER #================================================= -ynh_print_info --message="Updating Composer..." +ynh_print_info --message="Upgrading Composer..." ynh_install_composer --phpversion="7.2" --workdir="$final_path/.composer" #================================================= -# UPDATE DRUPAL +# UPGRADE DRUPAL #================================================= -ynh_print_info --message="Updating Drupal..." +ynh_print_info --message="Upgrading Drupal..." ynh_backup_if_checksum_is_different --file="$final_path/$app/sites/default/settings.php" export PATH="$final_path/.composer/vendor/bin:$PATH" From da2b0eb8823a48e46324dbeecdf94535757bfa62 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 13 Jun 2019 23:49:48 +0200 Subject: [PATCH 3/5] Update pull_request_template.md --- pull_request_template.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index 50b3ba1..02643b1 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,13 +11,8 @@ - [ ] 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 group* -- **CI succeeded** : -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/civicrm_drupal7_ynh%20-BRANCH-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/civicrm_drupal7_ynh%20-BRANCH-/) -*Please replace '-BRANCH-' in this link by the name of the branch used.* -*If the PR is from a forked repository. Please provide public results from package_check.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* + +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/civicrm_drupal7_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/civicrm_drupal7_ynh%20PR-NUM-%20(USERNAME)/) From 8c1c33a2f2f9d228802feda077e95f22ebe972af Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 16 Jun 2019 15:55:55 +0200 Subject: [PATCH 4/5] Update check_process --- check_process | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/check_process b/check_process index fd2d13d..2eac283 100644 --- a/check_process +++ b/check_process @@ -15,24 +15,16 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=b90ed18d3309d1124171a02934c4d0ae9b53a087 backup_restore=1 multi_instance=1 - incorrect_path=1 + # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. + # incorrect_path=1 port_already_use=0 change_url=1 ;;; Levels - Level 1=auto - Level 2=auto - Level 3=auto -# Level 4: If the app supports LDAP and SSOwat, turn level 4 to '1' and add a link to an issue or a part of your code to show it. -# If the app does not use LDAP nor SSOwat, and can't use them, turn level 4 to 'na' and explain as well. - Level 4=0 + # If the level 5 (Package linter) is forced to 1. Please add justifications here. Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 ;;; Options Email=yalh@yahoo.com Notification=all From 7354c140c8f9e6fc9145e67315874f4aacdc2534 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 25 Jun 2019 22:27:57 +0200 Subject: [PATCH 5/5] removing dummy help --- manifest.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/manifest.json b/manifest.json index ec45b4e..16ca11c 100644 --- a/manifest.json +++ b/manifest.json @@ -76,10 +76,6 @@ "en": "Set the administrator password", "fr": "Définissez le mot de passe administrateur" }, - "help": { - "en": "Use the help field to add an information for the admin about this question.", - "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question." - }, "example": "Choose a password" }, {