diff --git a/anda/desktops/noctalia-qs/VERSION_qt6-qtbase.txt b/anda/desktops/noctalia-qs/VERSION_qt6-qtbase.txt new file mode 100644 index 0000000000..fac714a322 --- /dev/null +++ b/anda/desktops/noctalia-qs/VERSION_qt6-qtbase.txt @@ -0,0 +1 @@ +6.11.1 diff --git a/anda/desktops/noctalia-qs/anda.hcl b/anda/desktops/noctalia-qs/anda.hcl index 2f51b5f5ef..96830e8080 100644 --- a/anda/desktops/noctalia-qs/anda.hcl +++ b/anda/desktops/noctalia-qs/anda.hcl @@ -1,5 +1,8 @@ project pkg { - rpm { - spec = "noctalia-qs.spec" - } + rpm { + spec = "noctalia-qs.spec" + } + labels { + updbranch = 1 + } } diff --git a/anda/desktops/noctalia-qs/noctalia-qs.spec b/anda/desktops/noctalia-qs/noctalia-qs.spec index 8a86ee7e39..ad9bc942a9 100644 --- a/anda/desktops/noctalia-qs/noctalia-qs.spec +++ b/anda/desktops/noctalia-qs/noctalia-qs.spec @@ -2,7 +2,7 @@ Name: noctalia-qs Version: 0.0.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Flexible QtQuick based desktop shell toolkit License: LGPL-3.0-only AND GPL-3.0-only URL: https://github.com/noctalia-dev/noctalia-qs @@ -73,11 +73,14 @@ Flexible QtQuick based desktop shell toolkit. %{_libdir}/qt6/qml/Quickshell %changelog +* Thu May 21 2026 Willow C Reed +- Add update script so that release bumps when Qt updates its minor version, triggering a rebuild + * Sun Mar 29 2026 Willow C Reed - Add provides for a polkit agent and desktop notification daemon (so gnome doesn't get installed) * Thu Mar 05 2026 Willow C Reed -- Fix reision to actually be defined as a specific git commit since it never gets initialized rn +- Fix revision to actually be defined as a specific git commit since it never gets initialized rn - Also fix that noctalia-qs is replacing quickshell overall and not just for noctlaia users * Fri Feb 27 2026 Willow C Reed diff --git a/anda/desktops/noctalia-qs/update.rhai b/anda/desktops/noctalia-qs/update.rhai index 7872e1741f..d54c2b9e2d 100644 --- a/anda/desktops/noctalia-qs/update.rhai +++ b/anda/desktops/noctalia-qs/update.rhai @@ -1,7 +1,19 @@ -let release = get(`https://api.github.com/repos/noctalia-dev/noctalia-qs/tags`).json_arr()[0]; +import "andax/bump_extras.rhai" as bump; +import "andax/spec.rhai" as spec; -rpm.version(release.name); +let version = find(`quickshell VERSION "([\d.]+)"`, gh_rawfile("noctalia-dev/noctalia-qs", "master", "CMakeLists.txt"), 1); + +rpm.version(version); if rpm.changed() { - rpm.global("commit", release.commit.sha); + let commit = get(`https://api.github.com/repos/noctalia-dev/noctalia-qs/tags`).json_arr()[0].commit.sha; + rpm.global("commit", commit); +} + +open_file("anda/desktops/noctalia-qs/VERSION_qt6-qtbase.txt", "w").write(bump::bodhi("qt6-qtbase", bump::as_bodhi_ver(labels.branch))); // will trig rebuild when changed + +let dir = sub(`/[^/]+$`, "", __script_path); +if sh("[[ `git status " + dir + " --porcelain` ]] && exit 1 || exit 0", #{}).ctx.rc == 1 { + let rel = spec::get_release(rpm).parse_int(); + rpm.release(rel + 1); } \ No newline at end of file