From 6258913d3d3c6d523caa67e8fe28784905bcae6b Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 17 Jan 2023 15:10:00 +0100 Subject: [PATCH] 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