Skip to content

Commit 6c45bdb

Browse files
committed
nightly: bump Ubuntu release from plucky/noble to resolute
Plucky (25.04) reached EOL on 2026-01-25 and resolute (26.04 LTS) just promoted to `supported` in armbian/build's config/distributions. Two swaps, both scoped to nightly targets: - targets-release-nightly.manual: minimal-cli-stable-ubuntu-cloud flips RELEASE plucky -> resolute (the target is labelled "Ubuntu stable" but was pinned to an interim release). - generate_targets.py: generate_nightly_yaml() now emits nightly-resolute-{gnome,xfce,riscv64-xfce,minimal} instead of the noble-named variants. Target keys, RELEASE values, block comments, the function docstring, and the trailing loongarch note are all updated. Stable and community targets in generate_targets.py stay on noble — this change is nightly-only per the request. Once resolute is confirmed good on the nightly channel, the same swap can be repeated for stable/community in a follow-up.
1 parent d797d0c commit 6c45bdb

2 files changed

Lines changed: 20 additions & 20 deletions

File tree

release-targets/targets-release-nightly.manual

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ minimal-cli-stable-ubuntu-cloud:
99
gha: *armbian-gha
1010
build-image: "yes"
1111
vars:
12-
RELEASE: plucky
12+
RELEASE: resolute
1313
BUILD_MINIMAL: "yes"
1414
BUILD_DESKTOP: "no"
1515
items:

scripts/generate_targets.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,9 +1072,9 @@ def generate_nightly_yaml(conf_wip_boards, manual_content=""):
10721072
"""
10731073
Generate nightly.yml with:
10741074
- One minimal Debian Forky CLI image for all boards
1075-
- For fast HDMI: Ubuntu Noble GNOME desktop
1076-
- For slow HDMI: Ubuntu Noble XFCE desktop
1077-
- For headless and exotics (riscv64, loongarch): Ubuntu Noble minimal CLI
1075+
- For fast HDMI: Ubuntu Resolute GNOME desktop
1076+
- For slow HDMI: Ubuntu Resolute XFCE desktop
1077+
- For headless and exotics (riscv64, loongarch): Ubuntu Resolute minimal CLI
10781078
One image per board for conf/wip boards.
10791079
Separates fast, slow, riscv64, loongarch, and headless boards based on CPU performance.
10801080
manual_content: Additional YAML to append inside the targets section
@@ -1156,15 +1156,15 @@ def generate_nightly_yaml(conf_wip_boards, manual_content=""):
11561156
yaml += ' - *nightly-loongarch\n'
11571157

11581158
yaml += """
1159-
# Ubuntu noble GNOME desktop for fast HDMI boards
1160-
nightly-noble-gnome:
1159+
# Ubuntu resolute GNOME desktop for fast HDMI boards
1160+
nightly-resolute-gnome:
11611161
enabled: yes
11621162
configs: [ armbian-images ]
11631163
pipeline:
11641164
gha: *armbian-gha
11651165
build-image: "yes"
11661166
vars:
1167-
RELEASE: noble
1167+
RELEASE: resolute
11681168
BUILD_MINIMAL: "no"
11691169
BUILD_DESKTOP: "yes"
11701170
DESKTOP_ENVIRONMENT: "gnome"
@@ -1174,18 +1174,18 @@ def generate_nightly_yaml(conf_wip_boards, manual_content=""):
11741174
- *nightly-fast-hdmi
11751175
"""
11761176

1177-
# Ubuntu noble XFCE desktop for slow HDMI boards
1177+
# Ubuntu resolute XFCE desktop for slow HDMI boards
11781178
if slow_boards:
11791179
yaml += """
1180-
# Ubuntu noble XFCE desktop for slow HDMI boards
1181-
nightly-noble-xfce:
1180+
# Ubuntu resolute XFCE desktop for slow HDMI boards
1181+
nightly-resolute-xfce:
11821182
enabled: yes
11831183
configs: [ armbian-images ]
11841184
pipeline:
11851185
gha: *armbian-gha
11861186
build-image: "yes"
11871187
vars:
1188-
RELEASE: noble
1188+
RELEASE: resolute
11891189
BUILD_MINIMAL: "no"
11901190
BUILD_DESKTOP: "yes"
11911191
DESKTOP_ENVIRONMENT: "xfce"
@@ -1195,18 +1195,18 @@ def generate_nightly_yaml(conf_wip_boards, manual_content=""):
11951195
- *nightly-slow-hdmi
11961196
"""
11971197

1198-
# Ubuntu noble XFCE desktop for RISC-V boards
1198+
# Ubuntu resolute XFCE desktop for RISC-V boards
11991199
if riscv64_boards:
12001200
yaml += """
1201-
# Ubuntu noble XFCE desktop for RISC-V boards
1202-
nightly-noble-riscv64-xfce:
1201+
# Ubuntu resolute XFCE desktop for RISC-V boards
1202+
nightly-resolute-riscv64-xfce:
12031203
enabled: yes
12041204
configs: [ armbian-images ]
12051205
pipeline:
12061206
gha: *armbian-gha
12071207
build-image: "yes"
12081208
vars:
1209-
RELEASE: noble
1209+
RELEASE: resolute
12101210
BUILD_MINIMAL: "no"
12111211
BUILD_DESKTOP: "yes"
12121212
DESKTOP_ENVIRONMENT: "xfce"
@@ -1216,25 +1216,25 @@ def generate_nightly_yaml(conf_wip_boards, manual_content=""):
12161216
- *nightly-riscv64
12171217
"""
12181218

1219-
# Ubuntu noble minimal CLI for headless boards only
1219+
# Ubuntu resolute minimal CLI for headless boards only
12201220
if headless_boards:
12211221
yaml += """
1222-
# Ubuntu noble minimal CLI for headless boards
1223-
nightly-noble-minimal:
1222+
# Ubuntu resolute minimal CLI for headless boards
1223+
nightly-resolute-minimal:
12241224
enabled: yes
12251225
configs: [ armbian-images ]
12261226
pipeline:
12271227
gha: *armbian-gha
12281228
build-image: "yes"
12291229
vars:
1230-
RELEASE: noble
1230+
RELEASE: resolute
12311231
BUILD_MINIMAL: "yes"
12321232
BUILD_DESKTOP: "no"
12331233
items:
12341234
- *nightly-headless
12351235
"""
12361236

1237-
# Note: loongarch boards don't get noble images, only bookworm minimal
1237+
# Note: loongarch boards don't get resolute images, only bookworm minimal
12381238

12391239
if manual_content:
12401240
# Indent manual content by 2 spaces to be under targets:

0 commit comments

Comments
 (0)