Merge pull request #102 from YunoHost-Apps/testing

Testing

README.md

@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Dolibarr ERP & CRM is a modern software for managing your professional or associative activity (contacts, invoices, orders, stocks, agenda, etc.).
 
-**Shipped version:** 16.0.5~ynh1
+**Shipped version:** 17.0.1~ynh1
 
 **Demo:** https://www.dolibarr.org/onlinedemo
 

README_fr.md

@@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Dolibarr ERP & CRM est un logiciel moderne de gestion de votre activité professionnelle ou associative (contacts, factures, commandes, stocks, agenda, etc.).
 
-**Version incluse :** 16.0.5~ynh1
+**Version incluse :** 17.0.1~ynh1
 
 **Démo :** https://www.dolibarr.org/onlinedemo
 

check_process

@@ -11,7 +11,7 @@
 		setup_private=0
 		setup_public=0
 		upgrade=1
-		upgrade=1	from_commit=ecb5cbdd72c42fc33b9377f6a53a5aab3a22c754
+		upgrade=1	from_commit=7e3914481ac4d6c40f3be3f35f155fac6f4387c6
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
@@ -21,5 +21,5 @@ Email=
 Notification=none
 ;;; Upgrade options
 	; commit=CommitHash
-		name=9.0.4
+		name=16.0.5
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&

conf/extra_php-fpm.conf

@@ -5,6 +5,6 @@ php_admin_value[upload_max_filesize] = 50M
 php_admin_value[post_max_size] = 50M
 
 ; Other common parameters
-php_admin_value[max_execution_time] = 600
+php_admin_value[max_execution_time] = 1600
 php_admin_value[max_input_time] = 300
 php_admin_value[memory_limit] = 256M

manifest.json

@@ -6,7 +6,7 @@
         "en": "Manage the various aspects of your business or association",
         "fr": "Gérez les différents aspects de votre activité pro ou associative"
     },
-    "version": "16.0.5~ynh1",
+    "version": "17.0.1~ynh1",
     "url": "https://www.dolibarr.org/",
     "upstream": {
         "license": "GPL-3.0-or-later",
@@ -23,12 +23,12 @@
         "url": "https://github.com/mastereur"
     },
     "requirements": {
-        "yunohost": ">= 11.0"
+        "yunohost": ">= 11.2"
     },
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.4-fpm",
+        "php8.1-fpm",
         "mysql"
     ],
     "arguments": {

scripts/_common.sh

@@ -3,7 +3,7 @@
 #=================================================
 # COMMON VARIABLES
 #=================================================
-YNH_PHP_VERSION="7.4"
+YNH_PHP_VERSION="8.1"
 
 php_dependencies="php$YNH_PHP_VERSION-mysql \
 						php$YNH_PHP_VERSION-imagick \

scripts/upgrade

@@ -203,9 +203,6 @@ SOURCE_FORMAT=tar.bz2
 SOURCE_IN_SUBDIR=true
 EOF
 
-	
-		# Download, check integrity, uncompress and patch the source from app.src
-		ynh_setup_source --dest_dir="$final_path"
 
 		chown -R $app: "$final_path"
 
@@ -238,7 +235,10 @@ EOF
 		fi
 
 		ynh_exec_fully_quiet sleep 5
-
+		
+		# Download, check integrity, uncompress and patch the source from app.src
+		ynh_setup_source --dest_dir="$final_path"
+		
 		pushd $final_path/htdocs/install/
 		
 		if php$phpversion upgrade.php $current_version $next_version > /var/log/$app/upgrade.html;  then

scripts/upgrade.d/upgrade.15.sh

@@ -4,4 +4,4 @@
 next_version="16.0.5"
 
 # Dolibarr tarball checksum
-dolibarr_source_sha256="c8298342558e62b955a6f4c01fedb6a187b2e0c0b2c1681a97158ca979f9304f"
+dolibarr_source_sha256="C8298342558E62B955A6F4C01FEDB6A187B2E0C0B2C1681A97158CA979F9304F"

scripts/upgrade.d/upgrade.16.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Target version of the Dolibarr update
+next_version="17.0.1"
+
+# Dolibarr tarball checksum
+dolibarr_source_sha256="2EDDD545C07EAE291AD46E48AB55D3ADB988D99C29A8DFAA2E2FDE0A890B0DDC"

scripts/upgrade.d/upgrade.last.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Target version of the Dolibarr update
-next_version="16.0.5"
+next_version="17.0.1"
 
 # Dolibarr tarball checksum
-dolibarr_source_sha256="c8298342558e62b955a6f4c01fedb6a187b2e0c0b2c1681a97158ca979f9304f"
+dolibarr_source_sha256="2EDDD545C07EAE291AD46E48AB55D3ADB988D99C29A8DFAA2E2FDE0A890B0DDC"