From bbbb86adf9f670a64211eb54d8fd754e1c49bbb3 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sat, 22 Feb 2025 09:10:14 -0800 Subject: [PATCH] feat(ghostty-nightly): Use actual Tip version (#3508) (#3514) * Dev ver changes Signed-off-by: Gilver * Yay shorter Rhai script Signed-off-by: Gilver * Technically a version bump so drop rel Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit 92f4424f011b6066185bcb28c18a19dd0238662c) Co-authored-by: Gilver --- anda/devs/ghostty/nightly/ghostty-nightly.spec | 9 ++++----- anda/devs/ghostty/nightly/update.rhai | 5 +---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index 7695284c35..bde1ef005b 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -3,8 +3,7 @@ %global fulldate 2025-02-22 %global commit_date %(echo %{fulldate} | sed 's/-//g') %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV -%global base_ver 1.1.2 -%global dev_ver 1.1.3 +%global ver 1.1.3 %if 0%{?fedora} <= 40 %global cache_dir %{_builddir}/zig-cache %else @@ -12,8 +11,8 @@ %endif Name: ghostty-nightly -Version: %{base_ver}~tip^%{commit_date}git%{shortcommit} -Release: 3%{?dist} +Version: %{ver}~tip^%{commit_date}git%{shortcommit} +Release: 1%{?dist} %if 0%{?fedora} <= 41 Epoch: 1 %endif @@ -142,7 +141,7 @@ zig build \ --prefix "%{_prefix}" --prefix-lib-dir "%{_libdir}" \ --prefix-exe-dir "%{_bindir}" --prefix-include-dir "%{_includedir}" \ --verbose \ - -Dversion-string="%{dev_ver}-dev+%{shortcommit}" \ + -Dversion-string="%{ver}-dev+%{shortcommit}" \ -Dcpu=baseline \ -Dstrip=false \ -Dpie=true \ diff --git a/anda/devs/ghostty/nightly/update.rhai b/anda/devs/ghostty/nightly/update.rhai index aaf6f5bf11..41a84906e2 100644 --- a/anda/devs/ghostty/nightly/update.rhai +++ b/anda/devs/ghostty/nightly/update.rhai @@ -7,10 +7,7 @@ if rpm.changed() { date.truncate(10); let html = get(`https://raw.githubusercontent.com/ghostty-org/ghostty/refs/heads/main/build.zig.zon`); let ver = find(".version = \"([\\d.]+)\"", html, 1); - let base = gh_tag("ghostty-org/ghostty"); - base.crop(1); - rpm.global("base_ver", base); rpm.global("fulldate", date); - rpm.global("dev_ver", ver); + rpm.global("ver", ver); rpm.release(); }