From 81713c795eadbac3150ec73406d9024d6fe21c4d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 06:58:18 +0200 Subject: [PATCH 1/6] backup config before upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 647b197..6c5f843 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -131,6 +131,7 @@ update-alternatives --set php /usr/bin/php7.0 #================================================= ynh_print_info --message="Updating Drupal..." +ynh_backup_if_checksum_is_different --file="$final_path/$app/sites/default/settings.php" export PATH="$final_path/vendor/bin:$PATH" #sudo -u $app env PATH=$PATH drush @$app.prod cache-clear all @@ -154,7 +155,6 @@ popd # 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 5ab215e2c33052ba2fe52d2743289f2783eb2804 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 1 Jun 2019 06:59:40 +0200 Subject: [PATCH 2/6] spelling --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6c5f843..f0a6503 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,18 +118,18 @@ ynh_print_info --message="Adding swap..." ynh_add_swap --size=512 #================================================= -# UPDATE COMPOSER +# UPGRADE COMPOSER #================================================= -ynh_print_info --message="Updating Composer..." +ynh_print_info --message="Upgrading Composer..." update-alternatives --set php /usr/bin/php7.2 ynh_install_composer --phpversion="7.2" --workdir="$final_path" update-alternatives --set php /usr/bin/php7.0 #================================================= -# 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/vendor/bin:$PATH" From dd4703f0da46f4cd86b1fb67457879415d05f9f5 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 13 Jun 2019 23:51:05 +0200 Subject: [PATCH 3/6] 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 ba05486..109db08 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/drupal_ynh%20-BRANCH-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/drupal_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/drupal_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/drupal_ynh%20PR-NUM-%20(USERNAME)/) From 84a06ff29d73b18b12049f86c3c0b9102c0630e7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 15 Jun 2019 00:23:53 +0200 Subject: [PATCH 4/6] Upgrade to 8.7.3 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2ec12d4..c6a6387 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:** 8.7.2 +**Shipped version:** 8.7.3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 461895b..dcd900d 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:** 8.7.2 +**Version incluse:** 8.7.3 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 11a137a..158ead5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/drupal-composer/drupal-project/archive/9e036f02949d81a423a09ec428c3384742e6b33d.tar.gz -SOURCE_SUM=468884a9d3b596114dd220251ce4ba5cb7fd97dcc123151b851b16617d9c1a5e +SOURCE_URL=https://github.com/drupal-composer/drupal-project/archive/ec0f41171516c18357ca4cda9068ee4cdeabaa19.tar.gz +SOURCE_SUM=aa94ea1e8a0cc382afb8e9f66b56af02ca7c60817403efc0e7b2a89c3dea09b8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c42841a..1be1576 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Drupal for YunoHost application.", "fr": "Drupal pour YunoHost." }, - "version": "8.7.2~ynh1", + "version": "8.7.3~ynh1", "url": "https://www.drupal.org", "license": "GPL-2.0-or-later", "maintainer": { From 881d1033d0192710c9999a5449266f2132bbd71b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 16 Jun 2019 15:47:56 +0200 Subject: [PATCH 5/6] Update check_process --- check_process | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 1319404..cf58789 100644 --- a/check_process +++ b/check_process @@ -18,7 +18,8 @@ upgrade=1 from_commit=f0af5b7a8e58615fe8ad73e3c1d6fe8d1369f061 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 From 11762aa4689926e5d82f74fa51827f8241973b85 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 16 Jun 2019 16:00:02 +0200 Subject: [PATCH 6/6] Update check_process --- check_process | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/check_process b/check_process index cf58789..27e721c 100644 --- a/check_process +++ b/check_process @@ -23,18 +23,8 @@ 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