From e46cb00cb02d9b20fa6858d02be106820efd00dd Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:04:01 -0700 Subject: [PATCH] fix(update): authy lomiri-ui-toolkit zed-* manrope albius stellar (#1468) (#1476) (cherry picked from commit 5d384c83c5cc7c28455c92659149265044f1528c) Co-authored-by: madomado --- anda/apps/authy/{update.rhai => update.rhai.bak} | 0 anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai | 3 ++- anda/devs/zed/nightly/update.rhai | 2 +- anda/devs/zed/preview/update.rhai | 5 ++++- anda/fonts/manrope/{update.rhai => update.rhai.bak} | 0 anda/langs/go/albius/anda.hcl | 3 +++ anda/langs/go/albius/update.rhai | 8 +++++++- anda/tools/umstellar/update.rhai | 2 +- 8 files changed, 18 insertions(+), 5 deletions(-) rename anda/apps/authy/{update.rhai => update.rhai.bak} (100%) rename anda/fonts/manrope/{update.rhai => update.rhai.bak} (100%) diff --git a/anda/apps/authy/update.rhai b/anda/apps/authy/update.rhai.bak similarity index 100% rename from anda/apps/authy/update.rhai rename to anda/apps/authy/update.rhai.bak diff --git a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai index 57f833b80f..7b8f49ae38 100644 --- a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai +++ b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai @@ -1,4 +1,5 @@ rpm.version(gitlab_tag("19057685")); if rpm.changed() { - rpm.global("commit", gitlab_commit("19057685")); + rpm.global("commit", gitlab_commit("19057685", "main")); + rpm.release(); } diff --git a/anda/devs/zed/nightly/update.rhai b/anda/devs/zed/nightly/update.rhai index ac2e45147e..104c1cd2f3 100644 --- a/anda/devs/zed/nightly/update.rhai +++ b/anda/devs/zed/nightly/update.rhai @@ -1,7 +1,7 @@ if filters.contains("nightly") { rpm.global("commit", gh_commit("zed-industries/zed")); if rpm.changed() { - let v = find("(\\d+\\.\\d+\\d+\\.\\d+)", find("\nversion = \"(\\d+\\.\\d+\\d+\\.\\d+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1), 1); + let v = find("\nversion = \"([.\\d]+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1); rpm.global("ver", v); rpm.global("commit_date", date()); rpm.release(); diff --git a/anda/devs/zed/preview/update.rhai b/anda/devs/zed/preview/update.rhai index 135a06de91..0c989e7421 100644 --- a/anda/devs/zed/preview/update.rhai +++ b/anda/devs/zed/preview/update.rhai @@ -6,5 +6,8 @@ for release in releases { let tag = release.tag_name; tag.pop(4); // remove the "-pre" suffix rpm.global("ver", tag); - terminate(); + break; + if rpm.changed() { + rpm.release(); + } } diff --git a/anda/fonts/manrope/update.rhai b/anda/fonts/manrope/update.rhai.bak similarity index 100% rename from anda/fonts/manrope/update.rhai rename to anda/fonts/manrope/update.rhai.bak diff --git a/anda/langs/go/albius/anda.hcl b/anda/langs/go/albius/anda.hcl index c7692fe7ce..6620202780 100644 --- a/anda/langs/go/albius/anda.hcl +++ b/anda/langs/go/albius/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "albius.spec" } + labels { + nightly = 1 + } } diff --git a/anda/langs/go/albius/update.rhai b/anda/langs/go/albius/update.rhai index 87582dfdbd..7bb7a31024 100644 --- a/anda/langs/go/albius/update.rhai +++ b/anda/langs/go/albius/update.rhai @@ -1 +1,7 @@ -rpm.version(gh("Vanilla-OS/Albius")); +if filters.contains("nightly") { + rpm.global("commit", gh_commit("Vanilla-OS/Albius")); + if rpm.changed() { + rpm.global("commit_date", date()); + rpm.release(); + } +} diff --git a/anda/tools/umstellar/update.rhai b/anda/tools/umstellar/update.rhai index 2dbdd2f889..b0ada8d0dd 100644 --- a/anda/tools/umstellar/update.rhai +++ b/anda/tools/umstellar/update.rhai @@ -1 +1 @@ -rpm.version("pypi_version", gh("Ultramarine-Linux/stellar")); +rpm.global("pypi_version", gh("Ultramarine-Linux/stellar"));