From 918014e66c7fcdee16c44967605d7484df938386 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 06:56:24 +0200 Subject: [PATCH 1/5] backup config before upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3dceb2d..da68349 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -127,6 +127,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 @@ -141,7 +142,6 @@ sudo -u $app env PATH=$PATH drush @$app l10n-update # 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 3da5f3ffdbefb3155760325cbf4e3d2b81592dff Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 06:57:23 +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 da68349..739335f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,9 +99,9 @@ ynh_print_info --message="Making sure dedicated system user exists..." ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= -# UPDATE PHP +# UPGRADE PHP #================================================= -ynh_print_info --message="Updating PHP..." +ynh_print_info --message="Upgrading PHP..." ynh_install_php --phpversion="7.2" --package="$extra_pkg_dependencies" @@ -116,16 +116,16 @@ ynh_add_fpm_config --phpversion="7.2" #================================================= # SPECIFIC UPGRADE #================================================= -# 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 35173dcdf0d77986af3c18f576fded202badbba1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 13 Jun 2019 23:50:49 +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 c4172ee..a5a719b 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/drupal7_ynh%20-BRANCH-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/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/drupal7_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/drupal7_ynh%20PR-NUM-%20(USERNAME)/) From 7112a08f1f4adb7883fedf1c3a8f6f38b80cf4aa Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 15 Jun 2019 00:33:50 +0200 Subject: [PATCH 4/5] Upgarde to 7.67 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bdcddc0..48d2a8c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Free and open-source content management framework. -**Shipped version:** 7 +**Shipped version:** 7.67 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 03decca..c89512c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble Framework de gestion de contenu libre et open-source. -**Version incluse:** 7 +**Version incluse:** 7.67 ## Captures d'écran diff --git a/manifest.json b/manifest.json index a468a61..91b2a2e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Drupal 7 for YunoHost application.", "fr": "Drupal 7 pour YunoHost." }, - "version": "7.0~ynh1", + "version": "7.67~ynh1", "url": "https://www.drupal.org", "license": "GPL-2.0-or-later", "maintainer": { From 5530e3f8173fbf18194b5b1fb5149adc817221ee Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 16 Jun 2019 15:59:15 +0200 Subject: [PATCH 5/5] Update check_process --- check_process | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/check_process b/check_process index fd2d13d..414c6e4 100644 --- a/check_process +++ b/check_process @@ -15,24 +15,16 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=89bf310b8ac87a61e5974508f2b41fbb32823e95 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