From b0d6a03421d07572a39bf4b25bdcc8cc24009aba Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 21 Dec 2022 19:00:07 +0545 Subject: [PATCH 1/2] Adjust .drone.star to properly point to the elasticsearch server --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index d926f445..67032c97 100644 --- a/.drone.star +++ b/.drone.star @@ -1959,7 +1959,7 @@ def setupElasticSearch(esVersion): "image": OC_CI_PHP % DEFAULT_PHP_VERSION, "commands": [ "cd %s" % dir["server"], - "php occ config:app:set search_elastic servers --value elasticsearch", + "php occ config:app:set search_elastic servers --value http://elasticsearch:9200", "php occ search:index:reset --force", ], }, From 4938166746f54241c377713a8a804a565526f4a6 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 21 Dec 2022 19:07:48 +0545 Subject: [PATCH 2/2] Allow validateDailyTarballBuild to be controlled from drone config --- .drone.star | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.drone.star b/.drone.star index 67032c97..59a7f297 100644 --- a/.drone.star +++ b/.drone.star @@ -46,6 +46,7 @@ config = { "master", ], "codestyle": True, + "validateDailyTarball": True, "phpstan": True, "phan": { "multipleVersions": { @@ -2342,6 +2343,12 @@ def skipIfUnchanged(ctx, type): return [] def validateDailyTarballBuild(): + if "validateDailyTarball" not in config: + return [] + + if not config["validateDailyTarball"]: + return [] + pipeline = { "kind": "pipeline", "type": "docker",