Merge pull request #28 from YunoHost-Apps/ci-auto-update-2024.07.02

2024-09-03 20:36:27 +02:00 · 2024-07-09 22:49:58 +02:00 · 2024-07-09 22:49:58 +02:00 · c99b921477
commit c99b921477
parent 7abc609382 a9bce6468a
16 changed files with 61 additions and 56 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # ifconfig-io for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://dash.yunohost.org/appci/app/ifconfig-io) ![Working status](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://ci-apps.yunohost.org/ci/apps/ifconfig-io/) ![Working status](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)

 [![Install ifconfig-io with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ifconfig-io)

@ -23,7 +23,7 @@ I used the gin framework as it does several things to ensure that there are no m
 Tested to handle 15,000 requests persecond on modest hardware with an average response time of 130ms.


-**Shipped version:** 2024.04.20~ynh1
+**Shipped version:** 2024.07.02~ynh1

 **Demo:** <https://ifconfig.io>
 ## Documentation and resources
--- a/README_es.md
+++ b/README_es.md
@ -5,7 +5,7 @@ No se debe editar a mano.

 # ifconfig-io para Yunohost

-[![Nivel de integración](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://dash.yunohost.org/appci/app/ifconfig-io) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://ci-apps.yunohost.org/ci/apps/ifconfig-io/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)

 [![Instalar ifconfig-io con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ifconfig-io)

@ -23,7 +23,7 @@ I used the gin framework as it does several things to ensure that there are no m
 Tested to handle 15,000 requests persecond on modest hardware with an average response time of 130ms.


-**Versión actual:** 2024.04.20~ynh1
+**Versión actual:** 2024.07.02~ynh1

 **Demo:** <https://ifconfig.io>
 ## Documentaciones y recursos
--- a/README_eu.md
+++ b/README_eu.md
@ -5,7 +5,7 @@ EZ editatu eskuz.

 # ifconfig-io YunoHost-erako

-[![Integrazio maila](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://dash.yunohost.org/appci/app/ifconfig-io) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://ci-apps.yunohost.org/ci/apps/ifconfig-io/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)

 [![Instalatu ifconfig-io YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ifconfig-io)

@ -23,7 +23,7 @@ I used the gin framework as it does several things to ensure that there are no m
 Tested to handle 15,000 requests persecond on modest hardware with an average response time of 130ms.


-**Paketatutako bertsioa:** 2024.04.20~ynh1
+**Paketatutako bertsioa:** 2024.07.02~ynh1

 **Demoa:** <https://ifconfig.io>
 ## Dokumentazioa eta baliabideak
--- a/README_fr.md
+++ b/README_fr.md
@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.

 # ifconfig-io pour YunoHost

-[![Niveau d’intégration](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://dash.yunohost.org/appci/app/ifconfig-io) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://ci-apps.yunohost.org/ci/apps/ifconfig-io/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)

 [![Installer ifconfig-io avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ifconfig-io)

@ -23,7 +23,7 @@ I used the gin framework as it does several things to ensure that there are no m
 Tested to handle 15,000 requests persecond on modest hardware with an average response time of 130ms.


-**Version incluse :** 2024.04.20~ynh1
+**Version incluse :** 2024.07.02~ynh1

 **Démo :** <https://ifconfig.io>
 ## Documentations et ressources
--- a/README_gl.md
+++ b/README_gl.md
@ -5,7 +5,7 @@ NON debe editarse manualmente.

 # ifconfig-io para YunoHost

-[![Nivel de integración](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://dash.yunohost.org/appci/app/ifconfig-io) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://ci-apps.yunohost.org/ci/apps/ifconfig-io/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)

 [![Instalar ifconfig-io con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ifconfig-io)

@ -23,7 +23,7 @@ I used the gin framework as it does several things to ensure that there are no m
 Tested to handle 15,000 requests persecond on modest hardware with an average response time of 130ms.


-**Versión proporcionada:** 2024.04.20~ynh1
+**Versión proporcionada:** 2024.07.02~ynh1

 **Demo:** <https://ifconfig.io>
 ## Documentación e recursos
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -5,7 +5,7 @@

 # YunoHost 上的 ifconfig-io

-[![集成程度](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://dash.yunohost.org/appci/app/ifconfig-io) ![工作状态](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/ifconfig-io.svg)](https://ci-apps.yunohost.org/ci/apps/ifconfig-io/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/ifconfig-io.maintain.svg)

 [![使用 YunoHost 安装 ifconfig-io](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ifconfig-io)

@ -23,7 +23,7 @@ I used the gin framework as it does several things to ensure that there are no m
 Tested to handle 15,000 requests persecond on modest hardware with an average response time of 130ms.


-**分发版本：** 2024.04.20~ynh1
+**分发版本：** 2024.07.02~ynh1

 **演示：** <https://ifconfig.io>
 ## 文档与资源
--- a/manifest.toml
+++ b/manifest.toml
@ -1,3 +1,5 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json
+
 packaging_format = 2

 id = "ifconfig-io"
@ -5,7 +7,7 @@ name = "ifconfig-io"
 description.en = "IP API service to get their public IP address"
 description.fr = "Service API IP pour obtenir leur adresse IP publique"

-version = "2024.04.20~ynh1"
+version = "2024.07.02~ynh1"

 maintainers = ["Fabian Wilkens"]

@ -43,10 +45,10 @@ ram.runtime = "50M"
    default = "visitors"

 [resources]
-        [resources.sources.main]
-        url = "https://github.com/georgyo/ifconfig.io/archive/6c13119b0b9cbf21143e4ca912dae26521dce8ae.tar.gz"
-        sha256 = "c61e36a3123c5fe48c0bd8c17b2a25f6af6f650ef4b5887df32096f4c5ce547e"
-        autoupdate.strategy = "latest_github_commit"
+    [resources.sources.main]
+    url = "https://github.com/georgyo/ifconfig.io/archive/57dcaffc5c74ae40ca3143ceeb0af64bf436ee63.tar.gz"
+    sha256 = "c3d7cfe762f7525e07524219a708ccdf2c4c57d4a6cea6eedcbababdd1069780"
+    autoupdate.strategy = "latest_github_commit"

    [resources.system_user]

--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -1,3 +1,21 @@
 #!/bin/bash

-GO_VERSION="1.19"
+#=================================================
+# COMMON VARIABLES
+#=================================================
+
+GO_VERSION="1.22"
+
+app_path="$install_dir/go/src/github.com/georgyo/ifconfig.io"
+
+#=================================================
+# PERSONAL HELPERS
+#=================================================
+
+#=================================================
+# EXPERIMENTAL HELPERS
+#=================================================
+
+#=================================================
+# FUTURE OFFICIAL HELPERS
+#=================================================
--- a/scripts/backup
+++ b/scripts/backup
@ -1,7 +1,5 @@
 #!/bin/bash

-#=================================================
-# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
--- a/scripts/install
+++ b/scripts/install
@ -3,14 +3,12 @@
 source _common.sh
 source /usr/share/yunohost/helpers

-app_path="$install_dir/go/src/github.com/georgyo/ifconfig.io"
-
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
 ynh_script_progression --message="Installing go..." --weight=5

-ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION
+ynh_exec_warn_less ynh_install_go --go_version="$GO_VERSION"

 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@ -20,7 +18,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ynh_setup_source --dest_dir="$app_path"

 chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
+chown -R "$app:www-data" "$install_dir"

 #=================================================
 # SPECIFIC SETUP
@ -34,8 +32,8 @@ export GOCACHE="$install_dir/go/.cache"
 export GO111MODULE=on

 pushd "$app_path"
-    ynh_exec_warn_less $ynh_go mod download
-    ynh_exec_warn_less $ynh_go build -tags=jsoniter
+    ynh_exec_warn_less ynh_exec_as "$app" "$ynh_go" mod download
+    ynh_exec_warn_less ynh_exec_as "$app" "$ynh_go" build -tags=jsoniter
 popd

 #=================================================
@ -51,7 +49,7 @@ ynh_add_systemd_config
 # Use logrotate to manage application logfile(s)
 ynh_use_logrotate --logfile="/var/log/$app/$app.log"

-yunohost service add $app --description="IP address API" --log="/var/log/$app/$app.log"
+yunohost service add "$app" --description="IP address API" --log="/var/log/$app/$app.log"

 #=================================================
 # START SYSTEMD SERVICE
@ -59,7 +57,7 @@ yunohost service add $app --description="IP address API" --log="/var/log/$app/$a
 ynh_script_progression --message="Starting service..." --weight=1

 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log"

 #=================================================
 # END OF SCRIPT
--- a/scripts/remove
+++ b/scripts/remove
@ -4,13 +4,12 @@ source _common.sh
 source /usr/share/yunohost/helpers

 #=================================================
-# STANDARD REMOVE
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1

 # 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..." --weight=1
+if ynh_exec_warn_less yunohost service status $app >/dev/null; then
 	yunohost service remove $app
 fi

--- a/scripts/restore
+++ b/scripts/restore
@ -1,7 +1,5 @@
 #!/bin/bash

-#=================================================
-# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
@ -17,19 +15,17 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 ynh_restore_file --origin_path="$install_dir"

 chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
+chown -R "$app:www-data" "$install_dir"

 mkdir -p "/var/log/$app"
-chown -R $app: "/var/log/$app"
+chown -R "$app:" "/var/log/$app"

-#=================================================
-# SPECIFIC RESTORATION
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
 ynh_script_progression --message="Reinstalling dependencies..." --weight=5

-ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION
+ynh_exec_warn_less ynh_install_go --go_version="$GO_VERSION"

 #=================================================
 # RESTORE SYSTEMD
@ -48,7 +44,7 @@ yunohost service add $app --description="IP address API" --log="/var/log/$app/$a
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression --message="Starting $app's systemd service..." --weight=1

 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"

--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -3,17 +3,13 @@
 source _common.sh
 source /usr/share/yunohost/helpers

-app_path="$install_dir/go/src/github.com/georgyo/ifconfig.io"
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
 ynh_script_progression --message="Upgrading go..." --weight=5

-ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION
+ynh_exec_warn_less ynh_install_go --go_version="$GO_VERSION"

-#=================================================
-# STANDARD UPGRADE STEPS
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
@ -29,7 +25,7 @@ ynh_script_progression --message="Upgrading source files..." --weight=1
 ynh_setup_source --dest_dir="$app_path" --full_replace=1

 chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
+chown -R "$app:www-data" "$install_dir"

 #=================================================
 # SPECIFIC UPGRADE
@ -42,8 +38,8 @@ export GOCACHE="$install_dir/go/.cache"
 export GO111MODULE=on

 pushd "$app_path"
-    ynh_exec_warn_less $ynh_go mod download
-    ynh_exec_warn_less $ynh_go build -tags=jsoniter
+    ynh_exec_warn_less ynh_exec_as "$app" "$ynh_go" mod download
+    ynh_exec_warn_less ynh_exec_as "$app" "$ynh_go" build -tags=jsoniter
 popd

 #=================================================
@ -57,14 +53,14 @@ ynh_add_systemd_config

 ynh_use_logrotate --non-append

-yunohost service add $app --description="IP address API" --log="/var/log/$app/$app.log"
+yunohost service add "$app" --description="IP address API" --log="/var/log/$app/$app.log"

 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression --message="Starting $app's systemd service..." --weight=1

-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log"

 #=================================================
 # END OF SCRIPT
--- a/sources/extra_files/app/.gitignore
+++ b/sources/extra_files/app/.gitignore
@ -1,2 +0,0 @@
-*~
-*.sw[op]
--- a/sources/patches/.gitignore
+++ b/sources/patches/.gitignore
@ -1,2 +0,0 @@
-*~
-*.sw[op]
--- a/tests.toml
+++ b/tests.toml
@ -1,7 +1,9 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json
+
 test_format = 1.0

 [default]

    # ------------
    # Tests to run
-    # ------------
+    # ------------