diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 8a84226..17fe4c0 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -17,8 +17,8 @@ #================================================= # Fetching information -current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') +current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]') +repo=$(cat manifest.toml | tomlq -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' | sort -V | tail -1) @@ -150,7 +150,7 @@ done #================================================= # Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json +echo "$(tomlq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.toml)" > manifest.toml # No need to update the README, yunohost-bot takes care of it diff --git a/tests.toml b/tests.toml index 093053c..257050e 100644 --- a/tests.toml +++ b/tests.toml @@ -15,9 +15,7 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.738ba505.name = "Upgrade from 7.2.0" - test_upgrade_from.1677cb9f.name = "Upgrade from 7.3.0" - + test_upgrade_from.c88d6ea7.name = "Upgrade from 7.5.2" ["Test-with-Team-Edition"] @@ -28,5 +26,4 @@ test_format = 1.0 args.version = "Team" args.team_display_name = "Mon équipe" - test_upgrade_from.738ba505.name = "Upgrade from 7.2.0" - test_upgrade_from.1677cb9f.name = "Upgrade from 7.3.0" + test_upgrade_from.c88d6ea7.name = "Upgrade from 7.5.2"