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

Merge pull request #102 from YunoHost-Apps/testing

Testing
This commit is contained in:
eric_G 2023-10-02 14:01:49 +02:00 committed by GitHub
commit 506f6fe9f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 23 additions and 16 deletions

View file

@ -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.). 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 **Demo:** https://www.dolibarr.org/onlinedemo

View file

@ -18,7 +18,7 @@ Si vous navez 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.). 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 **Démo :** https://www.dolibarr.org/onlinedemo

View file

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

View file

@ -5,6 +5,6 @@ php_admin_value[upload_max_filesize] = 50M
php_admin_value[post_max_size] = 50M php_admin_value[post_max_size] = 50M
; Other common parameters ; 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[max_input_time] = 300
php_admin_value[memory_limit] = 256M php_admin_value[memory_limit] = 256M

View file

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

View file

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

View file

@ -204,9 +204,6 @@ SOURCE_IN_SUBDIR=true
EOF EOF
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$final_path"
chown -R $app: "$final_path" chown -R $app: "$final_path"
# Remove the lock if it exists # Remove the lock if it exists
@ -239,6 +236,9 @@ EOF
ynh_exec_fully_quiet sleep 5 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/ pushd $final_path/htdocs/install/
if php$phpversion upgrade.php $current_version $next_version > /var/log/$app/upgrade.html; then if php$phpversion upgrade.php $current_version $next_version > /var/log/$app/upgrade.html; then

View file

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

View file

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

View file

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