From ac0ad08cbd24b54323e2c40ace5c1e941726d681 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 15 Feb 2022 22:04:41 +0100 Subject: [PATCH 1/4] Upgrade to 9.3.5~ynh1 --- README.md | 2 +- README_fr.md | 2 +- check_process | 6 +++++- conf/composer.json | 14 +++++++------- manifest.json | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index eb2932b..d957914 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Free and open-source content management framework. -**Shipped version:** 8.9.20~ynh1 +**Shipped version:** 9.3.5~ynh1 diff --git a/README_fr.md b/README_fr.md index 40f6e7f..ca57818 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Framework de gestion de contenu libre et open-source. -**Version incluse :** 8.9.20~ynh1 +**Version incluse :** 9.3.5~ynh1 diff --git a/check_process b/check_process index 5dca74e..686a278 100644 --- a/check_process +++ b/check_process @@ -16,13 +16,15 @@ setup_public=1 upgrade=1 # 8.7.1~ynh1 - #upgrade=1 from_commit=f0af5b7a8e58615fe8ad73e3c1d6fe8d1369f061 + # upgrade=1 from_commit=f0af5b7a8e58615fe8ad73e3c1d6fe8d1369f061 # 8.9.7~ynh1 upgrade=1 from_commit=08ca36cc16691ed64a11034c810f5adefb21186a # 8.9.7~ynh2 upgrade=1 from_commit=69b57e0d7cd862e4e5aef0bfc2bc2634874602c4 # 8.9.15~ynh1 upgrade=1 from_commit=06baed57a0650ec9a9e4e0f3348298065c1207f2 + # 8.9.20~ynh1 + upgrade=1 from_commit=25e747e0cde5e9ae2005181946f7f6cd31c597a5 backup_restore=1 multi_instance=1 port_already_use=0 @@ -39,3 +41,5 @@ Notification=all name=8.9.7~ynh2 ; commit=06baed57a0650ec9a9e4e0f3348298065c1207f2 name=8.9.15~ynh1 + ; commit=25e747e0cde5e9ae2005181946f7f6cd31c597a5 + name=8.9.20~ynh1 diff --git a/conf/composer.json b/conf/composer.json index 7a5f38e..e5d85f0 100644 --- a/conf/composer.json +++ b/conf/composer.json @@ -1,6 +1,6 @@ { "name": "drupal/recommended-project", - "description": "Project template for Drupal 8 projects with a relocated document root", + "description": "Project template for Drupal 9 projects with a relocated document root", "type": "project", "license": "GPL-2.0-or-later", "homepage": "https://www.drupal.org/project/drupal", @@ -15,14 +15,14 @@ } ], "require": { - "composer/installers": "^1.2", - "drupal/core-composer-scaffold": "^8.8", - "drupal/core-project-message": "^8.8", - "drupal/core-recommended": "^8.8", - "drush/drush": "^9.7.1 | ^10.0.0" + "composer/installers": "^1.9", + "drupal/core-composer-scaffold": "^9.3", + "drupal/core-project-message": "^9.3", + "drupal/core-recommended": "^9.3", + "drush/drush": "^11.0.0" }, "require-dev": { - "drupal/core-dev": "^8.8" + "drupal/core-dev": "^9.3" }, "conflict": { "drupal/drupal": "*" diff --git a/manifest.json b/manifest.json index 6478b87..e99e43d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A content management framework written in PHP", "fr": "Un système de gestion de contenu écrit en PHP" }, - "version": "8.9.20~ynh1", + "version": "9.3.5~ynh1", "url": "https://www.drupal.org", "upstream": { "license": "GPL-2.0-or-later", From 4a27177683aa3cbd30064c36146451ae5239fea9 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 15 Feb 2022 22:08:37 +0100 Subject: [PATCH 2/4] Update upgrade --- scripts/upgrade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index a372969..8a9c9bf 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -119,6 +119,9 @@ ynh_add_swap --size=$swap_needed #================================================= ynh_script_progression --message="Upgrading Composer..." +mkdir -p "$final_path/.composer" +ynh_add_config --template="../conf/composer.json" --destination="$final_path/composer.json" + ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" export PATH="$final_path/vendor/bin:$PATH" From d8b8ed86dca2b1c3b940fb7ed35d01be621ce64a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 16 Feb 2022 20:27:01 +0100 Subject: [PATCH 3/4] Fix PHP_VERSION for drupal 9 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 0fc0bdf..a2d8ed8 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="curl" swap_needed=512 -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" extra_php_dependencies="php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-simplexml php${YNH_PHP_VERSION}-curl" From 9b9b01a3882d4f2d6fc84b0cdd2055d515d00b24 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 17 Feb 2022 20:46:38 +0100 Subject: [PATCH 4/4] Fix upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8a9c9bf..c71de09 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,7 +122,7 @@ ynh_script_progression --message="Upgrading Composer..." mkdir -p "$final_path/.composer" ynh_add_config --template="../conf/composer.json" --destination="$final_path/composer.json" -ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" +ynh_exec_warn_less ynh_composer_exec --phpversion="$phpversion" --workdir="$final_path" --commands="update" export PATH="$final_path/vendor/bin:$PATH"