From 3d471af851d0b64c35e1c510b215a1483645ce75 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 1 Jun 2021 21:31:27 +0200 Subject: [PATCH] Add templates --- issue_template.md => .github/ISSUE_TEMPLATE.md | 8 ++++---- .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++++++++ manifest.json | 10 +++++++++- pull_request_template.md | 16 ---------------- scripts/remove | 18 +++++++++--------- 5 files changed, 38 insertions(+), 30 deletions(-) rename issue_template.md => .github/ISSUE_TEMPLATE.md (91%) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 pull_request_template.md diff --git a/issue_template.md b/.github/ISSUE_TEMPLATE.md similarity index 91% rename from issue_template.md rename to .github/ISSUE_TEMPLATE.md index afcaa8a..2729a6b 100644 --- a/issue_template.md +++ b/.github/ISSUE_TEMPLATE.md @@ -6,11 +6,11 @@ about: When creating a bug report, please use the following template to provide **How to post a meaningful bug report** 1. *Read this whole template first.* -2. *Make sure you are on the right place:* +2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* - - *In doubt, ask here and we will figure it out together.* -3. *Delete these italic comments as you write over them below, and remove this guide.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* --- ### Describe the bug @@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install taskboard + sudo yunohost app install the_app ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/manifest.json b/manifest.json index 94afa94..445f108 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,14 @@ }, "version": "1.0.2~ynh2", "url": "http://taskboard.matthewross.me/", + "upstream": { + "license": "MIT", + "website": "http://taskboard.matthewross.me/", + "demo": "https://taskboard.matthewross.me/demo", + "admindoc": "https://yunohost.org/packaging_apps", + "userdoc": "https://yunohost.org/apps", + "code": "https://github.com/kiswa/TaskBoard" + }, "license": "MIT", "maintainer": { "name": "eric_G", @@ -19,7 +27,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm" + "php7.3-fpm" ], "arguments": { "install": [{ diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 6c28fc5..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## 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. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/remove b/scripts/remove index bd456b4..87e5816 100644 --- a/scripts/remove +++ b/scripts/remove @@ -28,18 +28,10 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # Remove the service from the list of services known by Yunohost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service integration..." --time --weight=1 + ynh_script_progression --message="Removing $app service integration..." --weight=1 yunohost service remove $app fi -#================================================= -# REMOVE APP MAIN DIR -#================================================= -ynh_script_progression --message="Removing TaskBoard main directory..." --weight=4 - -# Remove the app directory securely -ynh_secure_remove "$final_path" - #================================================= # REMOVE DEPENDENCIES #================================================= @@ -48,6 +40,14 @@ ynh_script_progression --message="Removing dependencies..." --weight=2 # Remove metapackage and its dependencies ynh_remove_app_dependencies +#================================================= +# REMOVE APP MAIN DIR +#================================================= +ynh_script_progression --message="Removing TaskBoard main directory..." --weight=4 + +# Remove the app directory securely +ynh_secure_remove "$final_path" + #================================================= # REMOVE NGINX CONFIGURATION #=================================================