From 6258913d3d3c6d523caa67e8fe28784905bcae6b Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 17 Jan 2023 15:10:00 +0100 Subject: [PATCH 1/4] Propagate changes following CI_package_check merge --- conf/nginx.conf | 7 ++++--- conf/yunorunner.config.py | 5 +++-- scripts/_common.sh | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index ff7c444..c6f5f4f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -11,18 +11,19 @@ location __PATH__/ { include conf.d/yunohost_panel.conf.inc; location __PATH__/logs { - alias /home/CI_package_check/logs/; + alias __FINALPATH__/results/logs/; autoindex on; default_type "text/plain"; } location __PATH__/badges/ { - alias /home/CI_package_check/badges/; + alias __FINALPATH__/results/badges/; + more_set_headers "Cache-control: max-age=300, s-maxage=300"; autoindex on; } location __PATH__/summary/ { - alias /home/CI_package_check/summary/; + alias __FINALPATH__/results/summary/; autoindex on; etag off; more_set_headers "Cache-control: max-age=300, s-maxage=300"; diff --git a/conf/yunorunner.config.py b/conf/yunorunner.config.py index e160c44..e6da44c 100644 --- a/conf/yunorunner.config.py +++ b/conf/yunorunner.config.py @@ -1,9 +1,10 @@ BASE_URL = "https://__DOMAIN____PATH__" PORT = __PORT__ -DEBUG = False -PATH_TO_ANALYZER = "/home/CI_package_check/analyseCI.sh" +PATH_TO_ANALYZER = "__FINALPATH__/analyze_yunohost_app.sh" MONITOR_APPS_LIST = False MONITOR_GIT = False MONITOR_ONLY_GOOD_QUALITY_APPS = False MONTHLY_JOBS = False WORKER_COUNT = 1 +YNH_BRANCH = "stable" +DIST = "bullseye" diff --git a/scripts/_common.sh b/scripts/_common.sh index 4a84943..a835d15 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="python3-venv python3-dev python3-pip sqlite3 wkhtmltopdf optip yunorunner_repository="https://github.com/YunoHost/yunorunner" -yunorunner_release="51a55e8f5e487c7fdca457bb013fd34095dfffa3" +yunorunner_release="1ad0c34f7d681f787c612fb6de9f2b1b3c091af9" #================================================= # PERSONAL HELPERS From cbcf61d74a71a9703b29f1988c705086ee26ce69 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 17 Jan 2023 14:10:19 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 17 ++++++++--------- README_fr.md | 31 +++++++++++++++++-------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 1da00fe..d42bcf6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # YunoRunner for YunoHost -[![Integration level](https://dash.yunohost.org/integration/yunorunner.svg)](https://dash.yunohost.org/appci/app/yunorunner) ![](https://ci-apps.yunohost.org/ci/badges/yunorunner.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yunorunner.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/yunorunner.svg)](https://dash.yunohost.org/appci/app/yunorunner) ![Working status](https://ci-apps.yunohost.org/ci/badges/yunorunner.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yunorunner.maintain.svg) [![Install YunoRunner with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yunorunner) *[Lire ce readme en français.](./README_fr.md)* @@ -19,11 +19,9 @@ CI runner of YunoHost **Shipped version:** 2022.01.18~ynh2 - - ## Screenshots -![](./doc/screenshots/screenshot.png) +![Screenshot of YunoRunner](./doc/screenshots/screenshot.png) ## Disclaimers / important information @@ -34,19 +32,20 @@ CI runner of YunoHost ## Documentation and resources -* Upstream app code repository: https://github.com/YunoHost/yunorunner -* YunoHost documentation for this app: https://yunohost.org/app_yunorunner -* Report a bug: https://github.com/YunoHost-Apps/yunorunner_ynh/issues +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/yunorunner_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/yunorunner_ynh/tree/testing --debug or sudo yunohost app upgrade yunorunner -u https://github.com/YunoHost-Apps/yunorunner_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 5751f1d..5026474 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,25 +1,27 @@ + + # YunoRunner pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/yunorunner.svg)](https://dash.yunohost.org/appci/app/yunorunner) ![](https://ci-apps.yunohost.org/ci/badges/yunorunner.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yunorunner.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/yunorunner.svg)](https://dash.yunohost.org/appci/app/yunorunner) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yunorunner.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yunorunner.maintain.svg) [![Installer YunoRunner avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yunorunner) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer YunoRunner rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer YunoRunner rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Runner d'intégration continue de YunoHost **Version incluse :** 2022.01.18~ynh2 +## Captures d’écran - -## Captures d'écran - -![](./doc/screenshots/screenshot.png) +![Capture d’écran de YunoRunner](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -30,19 +32,20 @@ Runner d'intégration continue de YunoHost ## Documentations et ressources -* Dépôt de code officiel de l'app : https://github.com/YunoHost/yunorunner -* Documentation YunoHost pour cette app : https://yunohost.org/app_yunorunner -* Signaler un bug : https://github.com/YunoHost-Apps/yunorunner_ynh/issues +* Dépôt de code officiel de l’app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/yunorunner_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/yunorunner_ynh/tree/testing --debug ou sudo yunohost app upgrade yunorunner -u https://github.com/YunoHost-Apps/yunorunner_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 9611bb78b50366ccdf8a272ed76209955e3cf0e4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 17 Jan 2023 15:21:40 +0100 Subject: [PATCH 3/4] Install on /ci path by default --- manifest.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 1b2152d..3c6b82c 100644 --- a/manifest.json +++ b/manifest.json @@ -36,8 +36,7 @@ { "name": "path", "type": "path", - "example": "/yunorunner", - "default": "/yunorunner" + "default": "/ci" } ] } From 75c52f48983ea4abe9d7202cdce01b00b2951f62 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 17 Jan 2023 15:58:39 +0100 Subject: [PATCH 4/4] Bump commit --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index a835d15..9ac0539 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="python3-venv python3-dev python3-pip sqlite3 wkhtmltopdf optip yunorunner_repository="https://github.com/YunoHost/yunorunner" -yunorunner_release="1ad0c34f7d681f787c612fb6de9f2b1b3c091af9" +yunorunner_release="c851f73ed0d24584588ee732ed1ebccd4866fad9" #================================================= # PERSONAL HELPERS