From b65b8a3cd32c72cbbd2ea8df336460fc889f95fc Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 28 Jul 2023 00:38:28 +0800 Subject: [PATCH] fix(update): paper-plane pqmarble prismlauncher-{qt5-,}nightly voicevox (#659) --- anda/apps/paper-plane/update.rhai | 2 +- anda/audio/voicevox/update.rhai | 6 +++--- anda/audio/voicevox/voicevox.spec | 3 ++- anda/games/prismlauncher-nightly/update.rhai | 5 ++++- anda/games/prismlauncher-qt5-nightly/update.rhai | 5 ++++- anda/lib/pqmarble/update.rhai | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/anda/apps/paper-plane/update.rhai b/anda/apps/paper-plane/update.rhai index 20aa983867..86f30d0197 100644 --- a/anda/apps/paper-plane/update.rhai +++ b/anda/apps/paper-plane/update.rhai @@ -1 +1 @@ -rpm.version(gh("paper-plane-developers/paper-plane")); +rpm.version(gh_tag("paper-plane-developers/paper-plane")); diff --git a/anda/audio/voicevox/update.rhai b/anda/audio/voicevox/update.rhai index 7079f79d94..20399b6d08 100644 --- a/anda/audio/voicevox/update.rhai +++ b/anda/audio/voicevox/update.rhai @@ -1,5 +1,5 @@ let v = gh("VOICEVOX/voicevox"); -rpm.version(v); +rpm.global("ver", v); let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines; -rpm.define("nodev", find(">=([\\d.]+)", engines.node, 1)); -rpm.define("npmv", find(">=([\\d.]+)", engines.npm, 1)); +rpm.global("nodev", find(">=([\\d.]+)", engines.node, 1)); +rpm.global("npmv", find(">=([\\d.]+)", engines.npm, 1)); diff --git a/anda/audio/voicevox/voicevox.spec b/anda/audio/voicevox/voicevox.spec index a42c656019..4a2f84bc1e 100644 --- a/anda/audio/voicevox/voicevox.spec +++ b/anda/audio/voicevox/voicevox.spec @@ -1,9 +1,10 @@ %global nodev 16.17.0 %global npmv 8.11.0 +%global ver 0.14.7 %define debug_package %nil Name: voicevox -Version: 0.14.7 +Version: %ver Release: 1%?dist Summary: Free Japanese text-to-speech editor License: LGPL-3.0 diff --git a/anda/games/prismlauncher-nightly/update.rhai b/anda/games/prismlauncher-nightly/update.rhai index e5a93d1efe..b26ce9cfec 100644 --- a/anda/games/prismlauncher-nightly/update.rhai +++ b/anda/games/prismlauncher-nightly/update.rhai @@ -4,5 +4,8 @@ if filters.contains("nightly") { let sha = req.get().json().sha; rpm.global("commit", sha); rpm.release(); - // rpm.version(`${gh("PrismLauncher/PrismLauncher")}^%{snapshot_info}`); + let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt"); + let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1); + let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1); + rpm.version(`${maj}.${min}^%{snapshot_info}`); } diff --git a/anda/games/prismlauncher-qt5-nightly/update.rhai b/anda/games/prismlauncher-qt5-nightly/update.rhai index e5a93d1efe..b26ce9cfec 100644 --- a/anda/games/prismlauncher-qt5-nightly/update.rhai +++ b/anda/games/prismlauncher-qt5-nightly/update.rhai @@ -4,5 +4,8 @@ if filters.contains("nightly") { let sha = req.get().json().sha; rpm.global("commit", sha); rpm.release(); - // rpm.version(`${gh("PrismLauncher/PrismLauncher")}^%{snapshot_info}`); + let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt"); + let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1); + let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1); + rpm.version(`${maj}.${min}^%{snapshot_info}`); } diff --git a/anda/lib/pqmarble/update.rhai b/anda/lib/pqmarble/update.rhai index 49fbc60d30..4d5cf99735 100644 --- a/anda/lib/pqmarble/update.rhai +++ b/anda/lib/pqmarble/update.rhai @@ -1,4 +1,4 @@ let req = get("https://gitlab.gnome.org/api/v4/projects/1551/repository/branches/main").json(); -rpm.global("commit", req.commit.id) +rpm.global("commit", req.commit.id); let meson = get("https://gitlab.gnome.org/raggesilver/marble/-/raw/master/meson.build"); rpm.global("ver", find("(?m)^\\s+version:\\s*'(.+)',$", meson, 1));