YunoHost-Apps/drupal_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/drupal_ynh.git synced 2024-09-03 18:35:53 +02:00
Code Issues Activity Actions

Merge pull request #42 from YunoHost-Apps/9

Browse source 
9
This commit is contained in:
yalh76 2022-02-18 15:28:27 +01:00 • committed by GitHub
commit e522d04793
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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

2
README_fr.md
View file

@ -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

6
check_process
View file

@ -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

14
conf/composer.json
View file

@ -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": "*"

2
manifest.json
View file

@ -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",

2
scripts/_common.sh
View file

@ -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"

5
scripts/upgrade
View file

@ -119,7 +119,10 @@ ynh_add_swap --size=$swap_needed
#=================================================
ynh_script_progression --message="Upgrading Composer..."
ynh_install_composer --phpversion="$phpversion" --workdir="$final_path"
mkdir -p "$final_path/.composer"
ynh_add_config --template="../conf/composer.json" --destination="$final_path/composer.json"
ynh_exec_warn_less ynh_composer_exec --phpversion="$phpversion" --workdir="$final_path" --commands="update"
export PATH="$final_path/vendor/bin:$PATH"