Skip to content

Commit 08ee289

Browse files
authored
feat: enable KDE 6.6 Beta builds (ublue-os#1646)
* feat: enable KDE 6.6 Beta builds latest kernel is nasty, so just going for the coreos-stable kernel now on beta The panel task manager widget config is not present in the beta packages * fix: use latest kernel ostree hotfix and sysext is fixed in 6.18.5 * fix firewall installation
1 parent 9c5924f commit 08ee289

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

.github/workflows/build-image-beta.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ on:
88
- testing
99
paths-ignore:
1010
- "**.md"
11-
- "flatpaks/**"
12-
- "system_files/etc/bazaar/**"
13-
- "system_files/shared/etc/bazaar/**"
14-
- "**.Brewfile"
15-
- "just/*.just"
1611
workflow_call:
1712
workflow_dispatch:
1813

Justfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ build $image="aurora" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipeline
110110

111111
# Base Image
112112
base_image_name="kinoite"
113+
if [[ "${tag}" =~ beta ]]; then
114+
base_image_name="kinoite-beta"
115+
fi
113116

114117
# AKMODS Flavor and Kernel Version
115118
if [[ "${tag}" =~ stable ]]; then

build_files/base/04-packages.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,13 @@ dnf5 -y swap --repo='fedora' \
297297
OpenCL-ICD-Loader ocl-icd
298298

299299
# Explicitly install KDE Plasma related packages with the same version as in base image
300-
dnf5 -y install \
300+
if [[ "${UBLUE_IMAGE_TAG}" == "beta" ]]; then
301+
dnf -y copr enable @kdesig/kde-beta
302+
dnf -y copr disable @kdesig/kde-beta
303+
dnf -y --repo=copr:copr.fedorainfracloud.org:group_kdesig:kde-beta install plasma-firewall
304+
else
305+
dnf -y install \
301306
plasma-firewall-$(rpm -q --qf "%{VERSION}" plasma-desktop)
307+
fi
302308

303309
echo "::endgroup::"

build_files/base/20-tests.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ test -f /usr/share/wallpapers/aurora-wallpaper-9/contents/images/3840x2160.jxl
3030
test -L /usr/share/backgrounds/default.jxl
3131

3232
xmllint --noout \
33-
/usr/share/backgrounds/default.xml \
34-
/usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml
33+
/usr/share/backgrounds/default.xml
3534

3635
# If this file is not on the image bazaar will automatically be removed from users systems :(
3736
# See: https://docs.flatpak.org/en/latest/flatpak-command-reference.html#flatpak-preinstall

0 commit comments

Comments
 (0)