Merge pull request #40 from YunoHost-Apps/testing

Testing
2024-09-03 20:36:02 +02:00 · 2019-03-16 12:13:41 +01:00 · 2019-03-16 12:13:41 +01:00 · 093ec18f9f
commit 093ec18f9f
parent b8193de754 a870509c90
13 changed files with 44 additions and 64 deletions
--- a/README.md
+++ b/README.md
@ -44,7 +44,7 @@ If User Mode is configured Multiple users, the app be used by multiple users
 #### Supported architectures

 * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/writefreely%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/writefreely/)
-* ARMv8-A - **Not supported** [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/writefreely%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/writefreely/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/writefreely%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/writefreely/)
 * Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/writefreely%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/writefreely/)

 ## Limitations
--- a/4
+++ b/4
@ -39,8 +39,8 @@
 	Level 9=0
 	Level 10=0
 ;;; Options
-Email=
-Notification=none
+Email=yalh@yahoo.com
+Notification=yes
 #;;; Upgrade options
 #	; commit=CommitHash
 #		name=Name and date of the commit.
--- a/conf/arm.src
+++ b/conf/arm.src
@ -0,0 +1,6 @@
+SOURCE_URL=https://github.com/YunoHost-Apps/writefreely_ynh/releases/download/v0.8.1/writefreely_0.8.1_linux_arm64.tar.gz
+SOURCE_SUM=6d79707d68ffba331e6c490c881b8767c1f6d75785b84a1fe7669b3915db02e3
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=false
+SOURCE_FILENAME=
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
--- a/pull_request_template.md
+++ b/pull_request_template.md
@ -0,0 +1,23 @@
+## Problem
+- *Description of why you made this PR*
+
+## Solution
+- *And how do you fix that problem*
+
+## PR Status
+- [ ] Code finished.
+- [ ] Tested with Package_check.
+- [ ] Fix or enhancement tested.
+- [ ] Upgrade from last version tested.
+- [ ] Can be reviewed and tested.
+
+## Validation
+---
+- [ ] **Code review**
+- [ ] **Approval (LGTM)**  
+*Code review and approval have to be from a member of @YunoHost/apps group*
+- **CI succeeded** : 
+[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/writefreely_ynh%20-BRANCH-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/writefreely_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.
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -1,5 +1,12 @@
 #!/bin/bash

+#=================================================
+# COMMON VARIABLES
+#=================================================
+
+# dependencies used by the app
+#pkg_dependencies="deb1 deb2"
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================
--- a/scripts/backup
+++ b/scripts/backup
@ -8,19 +8,9 @@

 source ../settings/scripts/detect_arch
 source ../settings/scripts/_common.sh
-source ../settings/scripts/detect_arch
 source ../settings/scripts/ynh_systemd_action
 source /usr/share/yunohost/helpers

-#=================================================
-# MANAGE APPLICATION NOT COMPATIBLE WITH ARM
-#=================================================
-
-if [ $architecture = "arm" ]
-then
-        ynh_die "WriteFreely not available on Arm"
-fi
-
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================
--- a/scripts/change_url
+++ b/scripts/change_url
@ -6,19 +6,9 @@
 # IMPORT GENERIC HELPERS
 #=================================================

-source detect_arch
 source _common.sh
 source /usr/share/yunohost/helpers

-#=================================================
-# MANAGE APPLICATION NOT COMPATIBLE WITH ARM
-#=================================================
-
-if [ $architecture = "arm" ]
-then
-        ynh_die "WriteFreely not available on Arm"
-fi
-
 #=================================================
 # RETRIEVE ARGUMENTS
 #=================================================
--- a/scripts/detect_arch
+++ b/scripts/detect_arch
@ -1,11 +1,13 @@
 #!/bin/bash

-if [ -n "$(uname -m | grep 64)" ]; then
+if [ -n "$(uname -m | grep x86_64)" ]; then
 	architecture="x86-64"
 elif [ -n "$(uname -m | grep 86)" ]; then
 	architecture="i386"
 elif [ -n "$(uname -m | grep arm)" ]; then
 	architecture="arm"
+elif [ -n "$(uname -m | grep aarch64)" ]; then
+	architecture="arm"
 else
 	ynh_die "Unable to detect your achitecture, please open a bug describing \
        your hardware and the result of the command \"uname -m\"." 1
--- a/scripts/install
+++ b/scripts/install
@ -12,15 +12,6 @@ source detect_arch
 source ynh_systemd_action
 source /usr/share/yunohost/helpers

-#=================================================
-# MANAGE APPLICATION NOT COMPATIBLE WITH ARM
-#=================================================
-
-if [ $architecture = "arm" ]
-then
-        ynh_die "WriteFreely not available on Arm"
-fi
-
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================
@ -153,7 +144,7 @@ ynh_print_info "Setting up source files ..."

 ynh_app_setting_set $app final_path $final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source "$final_path"
+ynh_setup_source "$final_path" $architecture

 #=================================================
 # NGINX CONFIGURATION
--- a/scripts/remove
+++ b/scripts/remove
@ -6,20 +6,10 @@
 # IMPORT GENERIC HELPERS
 #=================================================

-source detect_arch
 source _common.sh
 source ynh_systemd_action
 source /usr/share/yunohost/helpers

-#=================================================
-# MANAGE APPLICATION NOT COMPATIBLE WITH ARM
-#=================================================
-
-if [ $architecture = "arm" ]
-then
-        ynh_die "WriteFreely not available on Arm"
-fi
-
 #=================================================
 # LOAD SETTINGS
 #=================================================
--- a/scripts/restore
+++ b/scripts/restore
@ -8,19 +8,9 @@

 source ../settings/scripts/detect_arch
 source ../settings/scripts/_common.sh
-source ../settings/scripts/detect_arch
 source ../settings/scripts/ynh_systemd_action
 source /usr/share/yunohost/helpers

-#=================================================
-# MANAGE APPLICATION NOT COMPATIBLE WITH ARM
-#=================================================
-
-if [ $architecture = "arm" ]
-then
-        ynh_die "WriteFreely not available on Arm"
-fi
-
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -13,15 +13,6 @@ source ynh_systemd_action
 source ynh_check_app_version_changed
 source /usr/share/yunohost/helpers

-#=================================================
-# MANAGE APPLICATION NOT COMPATIBLE WITH ARM
-#=================================================
-
-if [ $architecture = "arm" ]
-then
-        ynh_die "WriteFreely not available on Arm"
-fi
-
 #=================================================
 # LOAD SETTINGS
 #=================================================
@ -117,7 +108,7 @@ ynh_print_info "Upgrading source files..."
 # Download, check integrity, uncompress and patch the source from app.src
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-    ynh_setup_source "$final_path"
+    ynh_setup_source "$final_path" $architecture
 fi

 #=================================================