From 2dfdd7e475a20f7672bdb1432ae879091823cf84 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 13 Jan 2023 12:49:11 +0100 Subject: [PATCH] Change package to fetch version 8 of ElasticSearch --- .github/workflows/updater.sh | 5 +++-- conf/jvm.options | 2 +- manifest.json | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 2a2b8ad..847022f 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -17,7 +17,7 @@ current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') # Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true) | .tag_name | select( startswith("v7") )' | sort -V | tail -1) +version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true) | .tag_name | select( startswith("v8") )' | sort -V | tail -1) # Later down the script, we assume the version has only digits and dots # Sometimes the release name starts with a "v", so let's filter it out. @@ -105,7 +105,8 @@ done #================================================= # Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json +admindoc="https://www.elastic.co/guide/en/elasticsearch/reference/$(echo $version | grep -Po "^\d+\.\d+")/elasticsearch-intro.html" +echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\" | .upstream.admindoc = \"$admindoc\"" manifest.json)" > manifest.json # No need to update the README, yunohost-bot takes care of it diff --git a/conf/jvm.options b/conf/jvm.options index e805594..3cae266 100644 --- a/conf/jvm.options +++ b/conf/jvm.options @@ -11,7 +11,7 @@ ## -Xms4g ## -Xmx4g ## -## See https://www.elastic.co/guide/en/elasticsearch/reference/7.17/advanced-configuration.html +## See https://www.elastic.co/guide/en/elasticsearch/reference/8.6/advanced-configuration.html ## for more information ## ################################################################ diff --git a/manifest.json b/manifest.json index aed65b1..79a2daa 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { - "name": "ElasticSearch 7", - "id": "elasticsearch7", + "name": "ElasticSearch 8", + "id": "elasticsearch8", "packaging_format": 1, "description": { "en": "Distributed and RESTful search engine.",