Skip to content

Commit 3ba92b7

Browse files
committed
desktops: treat DESKTOP_APPGROUPS_SELECTED="none" as empty
The backwards-compat path added in 74af496 auto-selects tier=full whenever DESKTOP_APPGROUPS_SELECTED is non-empty — but the legacy targets at armbian/os hardcode DESKTOP_APPGROUPS_SELECTED="none" (the old sentinel for no appgroups) on every matrix entry, so every existing CI run gets bumped to tier=full instead of keeping the intended tier=mid default. Treat "none" as empty so only a genuine appgroup selection triggers the bump.
1 parent 857db91 commit 3ba92b7

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

lib/functions/configuration/config-desktop.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ for de in json.load(sys.stdin):
105105
# `full` includes everything the old appgroups provided. If a
106106
# userpatch or board config still sets DESKTOP_APPGROUPS_SELECTED and
107107
# hasn't opted into a tier explicitly, assume `full` to preserve the
108-
# old behaviour.
109-
if [[ -z $DESKTOP_TIER && -n $DESKTOP_APPGROUPS_SELECTED ]]; then
108+
# old behaviour. Treat "none" (the old sentinel meaning no appgroups
109+
# at all) as empty — the operator didn't actually pick any extras.
110+
if [[ -z $DESKTOP_TIER && -n $DESKTOP_APPGROUPS_SELECTED && "$DESKTOP_APPGROUPS_SELECTED" != "none" ]]; then
110111
display_alert "desktop-config" "legacy DESKTOP_APPGROUPS_SELECTED='${DESKTOP_APPGROUPS_SELECTED}' → selecting tier=full" "wrn"
111112
DESKTOP_TIER="full"
112113
fi

0 commit comments

Comments
 (0)