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

Merge pull request #8 from YunoHost-Apps/testing

Testing
This commit is contained in:
yalh76 2019-06-17 20:33:35 +02:00 committed by GitHub
commit 29ef94b456
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 31 deletions

View file

@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
## Overview ## Overview
Free and open-source content management framework. Free and open-source content management framework.
**Shipped version:** 8.7.2 **Shipped version:** 8.7.3
## Screenshots ## Screenshots

View file

@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
## Vue d'ensemble ## Vue d'ensemble
Framework de gestion de contenu libre et open-source. Framework de gestion de contenu libre et open-source.
**Version incluse:** 8.7.2 **Version incluse:** 8.7.3
## Captures d'écran ## Captures d'écran

View file

@ -18,22 +18,13 @@
upgrade=1 from_commit=f0af5b7a8e58615fe8ad73e3c1d6fe8d1369f061 upgrade=1 from_commit=f0af5b7a8e58615fe8ad73e3c1d6fe8d1369f061
backup_restore=1 backup_restore=1
multi_instance=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 port_already_use=0
change_url=1 change_url=1
;;; Levels ;;; Levels
Level 1=auto # If the level 5 (Package linter) is forced to 1. Please add justifications here.
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
Level 5=auto Level 5=auto
Level 6=auto
Level 7=auto
Level 8=0
Level 9=0
Level 10=0
;;; Options ;;; Options
Email=yalh@yahoo.com Email=yalh@yahoo.com
Notification=all Notification=all

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/drupal-composer/drupal-project/archive/9e036f02949d81a423a09ec428c3384742e6b33d.tar.gz SOURCE_URL=https://github.com/drupal-composer/drupal-project/archive/ec0f41171516c18357ca4cda9068ee4cdeabaa19.tar.gz
SOURCE_SUM=468884a9d3b596114dd220251ce4ba5cb7fd97dcc123151b851b16617d9c1a5e SOURCE_SUM=aa94ea1e8a0cc382afb8e9f66b56af02ca7c60817403efc0e7b2a89c3dea09b8
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

View file

@ -6,7 +6,7 @@
"en": "Drupal for YunoHost application.", "en": "Drupal for YunoHost application.",
"fr": "Drupal pour YunoHost." "fr": "Drupal pour YunoHost."
}, },
"version": "8.7.2~ynh1", "version": "8.7.3~ynh1",
"url": "https://www.drupal.org", "url": "https://www.drupal.org",
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"maintainer": { "maintainer": {

View file

@ -11,13 +11,8 @@
- [ ] Upgrade from last version tested. - [ ] Upgrade from last version tested.
- [ ] Can be reviewed and tested. - [ ] Can be reviewed and tested.
## Validation ## Package_check results
--- ---
- [ ] **Code review** *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*
- [ ] **Approval (LGTM)**
*Code review and approval have to be from a member of @YunoHost/apps group* [![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)/)
- **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.

View file

@ -118,19 +118,20 @@ ynh_print_info --message="Adding swap..."
ynh_add_swap --size=512 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 update-alternatives --set php /usr/bin/php7.2
ynh_install_composer --phpversion="7.2" --workdir="$final_path" ynh_install_composer --phpversion="7.2" --workdir="$final_path"
update-alternatives --set php /usr/bin/php7.0 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" export PATH="$final_path/vendor/bin:$PATH"
#sudo -u $app env PATH=$PATH drush @$app.prod cache-clear all #sudo -u $app env PATH=$PATH drush @$app.prod cache-clear all
@ -154,7 +155,6 @@ popd
# STORE THE CONFIG FILE CHECKSUM # 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. # Recalculate and store the checksum of the file for the next upgrade.
ynh_store_file_checksum --file="$final_path/$app/sites/default/settings.php" ynh_store_file_checksum --file="$final_path/$app/sites/default/settings.php"