From c7f9a6fc691abf072ef318339366edff0cd4e922 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sat, 10 Jan 2026 21:34:23 -0800 Subject: [PATCH] chore: switch stardust-armillary to version based (#9025) (#9078) (cherry picked from commit 4a97be93fe207df3fb6e0dd56dd47c6cfe8a5714) Signed-off-by: Owen-sz Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> --- anda/stardust/armillary/anda.hcl | 3 --- anda/stardust/armillary/stardust-armillary.spec | 15 ++++++++------- anda/stardust/armillary/update.rhai | 6 +----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/anda/stardust/armillary/anda.hcl b/anda/stardust/armillary/anda.hcl index 31ad1adca2..261ee3ed48 100644 --- a/anda/stardust/armillary/anda.hcl +++ b/anda/stardust/armillary/anda.hcl @@ -2,7 +2,4 @@ project pkg { rpm { spec = "stardust-armillary.spec" } - labels { - nightly = 1 - } } diff --git a/anda/stardust/armillary/stardust-armillary.spec b/anda/stardust/armillary/stardust-armillary.spec index 07856e93f7..5a5e5ad1c3 100644 --- a/anda/stardust/armillary/stardust-armillary.spec +++ b/anda/stardust/armillary/stardust-armillary.spec @@ -1,15 +1,13 @@ -%global commit c278020dc78587e887f91377a882b50d0b009c50 -%global commit_date 20251130 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) # Exclude input files from mangling %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ Name: stardust-xr-armillary -Version: %commit_date.%shortcommit -Release: 2%?dist +Version: 0.50.0 +Release: 1%?dist +Epoch: 1 Summary: Model viewer for Stardust XR URL: https://github.com/StardustXR/armillary -Source0: %url/archive/%commit/armillary-%commit.tar.gz +Source0: %url/archive/refs/tags/%version.tar.gz License: MIT BuildRequires: cargo cmake anda-srpm-macros cargo-rpm-macros mold @@ -20,7 +18,7 @@ Packager: Owen Zimmerman A model viewer for Stardust XR which works great for hand tracking, pointers, and controllers. %prep -%autosetup -n armillary-%commit +%autosetup -n armillary-%version %cargo_prep_online %build @@ -38,5 +36,8 @@ A model viewer for Stardust XR which works great for hand tracking, pointers, an %doc README.md %changelog +* Sat Jan 10 2026 Owen Zimmerman +- Switch to version based + * Sat Sep 7 2024 Owen-sz - Package StardustXR armillary diff --git a/anda/stardust/armillary/update.rhai b/anda/stardust/armillary/update.rhai index 4b75d1e64b..88d41ddc01 100644 --- a/anda/stardust/armillary/update.rhai +++ b/anda/stardust/armillary/update.rhai @@ -1,5 +1 @@ -rpm.global("commit", gh_commit("StardustXR/armillary")); -if rpm.changed() { - rpm.release(); - rpm.global("commit_date", date()); -} +rpm.version(gh_tag("StardustXR/armillary"));