Skip to content

Commit f602a4b

Browse files
bshermanbsherman
committed
Merge branch 'main' into fedora-43
2 parents 67868c3 + ef8c20a commit f602a4b

File tree

10 files changed

+28
-77
lines changed

10 files changed

+28
-77
lines changed

‎.github/workflows/build-latest.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ jobs:
2121
- base
2222
- kinoite
2323
- silverblue
24-
- sway-atomic
25-
- budgie-atomic
26-
- cosmic-atomic
2724
image_variant:
2825
- main
2926
- nvidia

‎.github/workflows/clean.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: dataaxiom/ghcr-cleanup-action@cd0cdb900b5dbf3a6f2cc869f0dbb0b8211f50c4 # v1.0.16
1818
with:
1919
token: ${{ secrets.GITHUB_TOKEN }}
20-
packages: silverblue-main,kinoite-main,sericea-main,onyx-main,base-main,lazurite-main,vauxite-main
20+
packages: silverblue-main,kinoite-main,base-main
2121
older-than: 90 days
2222
delete-orphaned-images: true
2323
keep-n-tagged: 7

‎.github/workflows/reusable-build.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,17 @@ jobs:
5454
IMAGE_NAME: ${{ inputs.image_name }}
5555
IMAGE_VERSION_ALIAS: ${{ inputs.image_version }}
5656
IMAGE_VARIANT: ${{ inputs.image_variant }}
57+
EVENT_NAME: ${{ github.event_name }}
5758
run: |
5859
set -e
5960
61+
# Always build when workflow_dispatch is triggered
62+
if [ "${EVENT_NAME}" == "workflow_dispatch" ]; then
63+
echo "Build triggered by workflow_dispatch - always building"
64+
echo "build_required=true" >> "$GITHUB_OUTPUT"
65+
exit 0
66+
fi
67+
6068
# Fetch version from the Justfile
6169
IMAGE_VERSION=$(just -f ./pr/Justfile --evaluate "${IMAGE_VERSION_ALIAS}")
6270

‎Justfile‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ images := '(
3737
["base"]="base-atomic"
3838
["silverblue"]="silverblue"
3939
["kinoite"]="kinoite"
40-
["sway-atomic"]="sway-atomic"
41-
["budgie-atomic"]="budgie-atomic"
42-
["cosmic-atomic"]="cosmic-atomic"
4340
)'
4441

4542
# Fedora Versions
@@ -305,12 +302,6 @@ image-name-check $image_name $fedora_version $variant:
305302
# TODO: Remove this block when 42 becomes GTS
306303
if [[ "$fedora_version" -eq "40" ]]; then
307304
echo "($image_name-$variant $image_name $fedora_version)"
308-
elif [[ "$image_name" =~ lazurite|vauxite && "$fedora_version" -ge "42" ]]; then
309-
echo '{{ style('error') }}Invalid Image Name{{ NORMAL }}: Lazurite and Vauxite no longer supported >= F42' >&2
310-
exit 1
311-
elif [[ "$image_name" =~ sericea|onyx && "$fedora_version" -ge "42" ]]; then
312-
echo '{{ style('error') }}Invalid Image Name{{ NORMAL }}: Sericea and Onyx names are `-atomic` names on >= F42' >&2
313-
exit 1
314305
elif [[ "$image_name" =~ atomic && "$fedora_version" -le "41" ]]; then
315306
echo '{{ style('error') }}Invalid Image Name{{ NORMAL }}: {{ style('command') }}`-atomic` names only used on >= F42{{ NORMAL }}' >&2
316307
exit 1

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# NOTICE 15 October 2025:
2+
The deprecated sway, budgie, and cosmic images have now been removed, see #927
3+
14
# Main
25

36
[![build-41](https://github.com/ublue-os/main/actions/workflows/build-41.yml/badge.svg)](https://github.com/ublue-os/main/actions/workflows/build-41.yml)

‎build_files/check-build.sh‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,6 @@ case "${VARIANT_ID:-}" in
2727
plasma-discover
2828
)
2929
;;
30-
"budgie-atomic")
31-
IMPORTANT_PACKAGES+=(
32-
lightdm
33-
magpie
34-
budgie-desktop
35-
plasma-discover
36-
)
37-
;;
38-
"sway-atomic")
39-
IMPORTANT_PACKAGES+=(
40-
sddm
41-
sway
42-
)
43-
;;
4430
*) ;;
4531
esac
4632

‎build_files/nvidia-install.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia.
121121
# as we need forced load, also mustpre-load intel/amd iGPU else chromium web browsers fail to use hardware acceleration
122122
sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
123123

124-
if [[ "${IMAGE_NAME}" =~ sericea|sway-atomic ]]; then
125-
mv /etc/sway/environment{,.orig}
126-
install -Dm644 /usr/share/ublue-os/etc/sway/environment /etc/sway/environment
127-
fi
128-
129124
# re-enable negativo17-mutlimedia since we disabled it
130125
if [[ "${NEGATIVO17_MULT_PREV_ENABLED}" = "Y" ]]; then
131126
dnf5 config-manager setopt fedora-multimedia.enabled=1

‎build_files/packages.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
set -ouex pipefail
44

5+
# Validate packages.json before attempting to parse it
6+
# This ensures builds fail fast if the JSON is malformed
7+
if ! jq empty /ctx/packages.json 2>/dev/null; then
8+
echo "ERROR: packages.json contains syntax errors and cannot be parsed" >&2
9+
echo "Please fix the JSON syntax before building" >&2
10+
exit 1
11+
fi
12+
513
# build list of all packages requested for inclusion
614
readarray -t INCLUDED_PACKAGES < <(jq -r "[(.all.include | (.all, select(.\"$IMAGE_NAME\" != null).\"$IMAGE_NAME\")[]), \
715
(select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (.all, select(.\"$IMAGE_NAME\" != null).\"$IMAGE_NAME\")[])] \

‎image-versions.yaml‎

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,15 @@ images:
1111
- name: base-atomic-41
1212
image: quay.io/fedora-ostree-desktops/base-atomic
1313
tag: 41
14-
digest: sha256:dca0288a16d134777883bb94389fc54f8c42624d9bc23243b5b83fe290da2cd7
14+
digest: sha256:d2622eee79983dabbef122d75bbe182bf22530024ca84c7c64739ada1cb9f80e
1515
- name: silverblue-41
1616
image: quay.io/fedora-ostree-desktops/silverblue
1717
tag: 41
18-
digest: sha256:40c8c9cbc804ab62cfa0da9805bba87857b495f477da30b4cc5ab3694edee4ac
18+
digest: sha256:d8c5722fd2bf66c5a48896c07309cf13ed29d380051557e97a571b61c6cae817
1919
- name: kinoite-41
2020
image: quay.io/fedora-ostree-desktops/kinoite
2121
tag: 41
22-
digest: sha256:1098765293faf440efba4cb1b58c8861ed9041249e414ae1fb43df3da7e987a3
23-
- name: sway-atomic-41
24-
image: quay.io/fedora-ostree-desktops/sway-atomic
25-
tag: 41
26-
digest: sha256:9ef60649c0916e8c0b33d0744f13dea017a43bc6759df6053089a5d1714248aa
27-
- name: budgie-atomic-41
28-
image: quay.io/fedora-ostree-desktops/budgie-atomic
29-
tag: 41
30-
digest: sha256:4b3fbfba2c165bf159e57773eff8b34db303b4153324b59da8645adfecacf0c5
31-
- name: lxqt-atomic-41
32-
image: quay.io/fedora-ostree-desktops/lxqt-atomic
33-
tag: 41
34-
digest: sha256:425b48343bb62b040cd192de1f30cff6d6d939141ce1bb33274c3c0e258ae203
35-
- name: xfce-atomic-41
36-
image: quay.io/fedora-ostree-desktops/xfce-atomic
37-
tag: 41
38-
digest: sha256:48749092b07df515ef628f745ff50465db7fc8b3e468af709ebfd5b3968fd5e2
22+
digest: sha256:e5c744d1c4020e5bf4452e5163094f61f85f777028b943cb94d6b8cda7393873
3923

4024
# Fedora 42
4125
- name: akmods-42
@@ -49,28 +33,15 @@ images:
4933
- name: base-atomic-42
5034
image: quay.io/fedora-ostree-desktops/base-atomic
5135
tag: 42
52-
digest: sha256:89de330cc932b245485757a5728ba954bac328c473438dc144838cfcbd4a619d
36+
digest: sha256:ae189dec4204f54cde04358b773ec267730f5384615013934a21989bebc3250f
5337
- name: silverblue-42
5438
image: quay.io/fedora-ostree-desktops/silverblue
5539
tag: 42
56-
digest: sha256:87c71310740cbf9499e2f9414802071297711f8143fc5686ad2e99f7a98e36ca
40+
digest: sha256:a98a4e2905252ccb145912de01a8db4fc9869cd4209d0716868f7ad23239f590
5741
- name: kinoite-42
5842
image: quay.io/fedora-ostree-desktops/kinoite
5943
tag: 42
60-
digest: sha256:f1d968935644f6dccef27d5990350b5ff675cefe03a8de055b8e617ce07e2e0f
61-
- name: sway-atomic-42
62-
image: quay.io/fedora-ostree-desktops/sway-atomic
63-
tag: 42
64-
digest: sha256:14020a910ea04b7f7c8b702d4f431a805a5079952fbaa3988440c65f883cab97
65-
- name: budgie-atomic-42
66-
image: quay.io/fedora-ostree-desktops/budgie-atomic
67-
tag: 42
68-
digest: sha256:b3330252e2d4be43374d09b0d119bc3d744660e0dba47c6a17a3eead7f50c3d7
69-
- name: cosmic-atomic-42
70-
image: quay.io/fedora-ostree-desktops/cosmic-atomic
71-
tag: 42
72-
digest: sha256:662ce3df5e6dccb7a2d4cfca5f0544844209f4afe90c236f112eddb00246b4ab
73-
44+
digest: sha256:49d55fb8edf523e2eb7063ebcf93146524849181ec4620c99bc7fad5327202b5
7445

7546
# Fedora 43
7647
- name: akmods-43

‎packages.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@
8181
"kate",
8282
"kcm-fcitx5",
8383
"ksshaskpass"
84-
],
85-
"sway-atomic": [
86-
"clipman",
87-
"gvfs-mtp",
88-
"thunar-volman",
89-
"tumbler"
9084
]
9185
},
9286
"exclude": {
@@ -103,8 +97,7 @@
10397
"all": [
10498
"mesa-libxatracker",
10599
"pipewire-libs-extra"
106-
],
107-
"sericea": ["clipman", "gvfs-mtp", "thunar-volman", "tumbler"]
100+
]
108101
},
109102
"exclude": {
110103
"all": []
@@ -115,8 +108,7 @@
115108
"all": [
116109
"mesa-libxatracker",
117110
"pipewire-libs-extra"
118-
],
119-
"sway-atomic": []
111+
]
120112
},
121113
"exclude": {
122114
"all": []

0 commit comments

Comments
 (0)