From fdd62ad17e6c7f2bc76e7e232f7158febac6b6ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 3 Jan 2021 17:42:35 +0100 Subject: [PATCH 1/3] Hot fix (#57) (#58) * Remove -- deployment that make upgrade to fail * Stop before removing the systemd service --- check_process | 6 +++--- manifest.json | 4 ++-- scripts/remove | 16 ++++++++-------- scripts/upgrade | 7 ++++--- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/check_process b/check_process index 6d1f2ae..75ae2d2 100644 --- a/check_process +++ b/check_process @@ -21,7 +21,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=4c29aa94f9d9048411c6e165e122e03574fb9b8d + upgrade=1 from_commit=ec8858ed0d054049a0c8f46c6126ee8ae0798e8f backup_restore=1 multi_instance=0 port_already_use=1 (8095) @@ -32,6 +32,6 @@ Email= Notification=change ;;; Upgrade options - ; commit=4c29aa94f9d9048411c6e165e122e03574fb9b8d - name=08 Sep 2017 4c29aa94f9d9048411c6e165e122e03574fb9b8d + ; commit=ec8858ed0d054049a0c8f46c6126ee8ae0798e8f + name=22 May 2020 ec8858ed0d054049a0c8f46c6126ee8ae0798e8f manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&always_encrypt=1& diff --git a/manifest.json b/manifest.json index 8e01235..9a0d7b4 100644 --- a/manifest.json +++ b/manifest.json @@ -6,9 +6,9 @@ "en": "Self hosting images and sharing anonymous application", "fr": "Application d'hébergement et de partage d'images anonyme" }, - "version": "0.12.1~ynh1", + "version": "0.12.1~ynh2", "url": "https://lut.im", - "license": "AGPL-3.0", + "license": "AGPL-3.0-only", "maintainer": { "name": "None...", "email": "" diff --git a/scripts/remove b/scripts/remove index 2dab54d..866272f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -21,14 +21,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # STANDARD REMOVE -#================================================= -# STOP AND REMOVE SERVICE -#================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --weight=6 - -# Remove the dedicated systemd config -ynh_remove_systemd_config - #================================================= # REMOVE SERVICE FROM ADMIN PANEL #================================================= @@ -40,6 +32,14 @@ then yunohost service remove $app fi +#================================================= +# STOP AND REMOVE SERVICE +#================================================= +ynh_script_progression --message="Stopping and removing the systemd service..." --weight=6 + +# Remove the dedicated systemd config +ynh_remove_systemd_config + #================================================= # REMOVE DEPENDENCIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5fa528b..13824eb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -266,9 +266,10 @@ ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_fil if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading $app with Carton..." --weight=4 - (cd $final_path - ynh_secure_remove --file="$final_path/local" - carton install --deployment --without=mysql --without=htpasswd --without=test) + pushd "$final_path" + ynh_secure_remove --file="$final_path/local" + carton install --without=mysql --without=htpasswd --without=test + popd fi #================================================= From 11758cc29ceaa4fa31928f49b2de3941505ac1c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 14 Feb 2021 22:54:26 +0100 Subject: [PATCH 2/3] Testing (#59) * Hot fix (#57) * Remove -- deployment that make upgrade to fail * Stop before removing the systemd service * Finding an available port Co-authored-by: Alexandre Aubin --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index c5d0bfa..81edd90 100644 --- a/scripts/install +++ b/scripts/install @@ -61,7 +61,7 @@ ynh_app_setting_set --app=$app --key=admin_mail_html --value=1 #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Configuring firewall..." --weight=3 +ynh_script_progression --message="Finding an available port..." --weight=3 # Find a free port port=$(ynh_find_port --port=8095) From f2fa34ac89c3253caaa0d690b0f99e632f934356 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 13 May 2021 17:48:58 +0200 Subject: [PATCH 3/3] [autopatch] Update issue and PR templates --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ 2 files changed, 71 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +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.* + - *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 + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + 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:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* 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)