Skip to content

Commit

Permalink
feat: enable Fedora 41 builds (#638)
Browse files Browse the repository at this point in the history
Co-authored-by: Benjamin Sherman <[email protected]>
  • Loading branch information
p5 and bsherman authored Oct 18, 2024
1 parent 5006127 commit f959353
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 13 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/build-41.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: ublue main 41
on:
pull_request:
merge_group:
schedule:
- cron: '5 4 * * *' # 4am-ish UTC everyday (timed against official fedora container pushes)
workflow_dispatch:

jobs:
build:
name: build
uses: ./.github/workflows/reusable-build.yml
secrets: inherit
with:
fedora_version: 41
10 changes: 8 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@ sed -i '0,/enabled=1/{s/enabled=1/enabled=1\npriority=90/}' /etc/yum.repos.d/neg
rpm-ostree override replace \
--experimental \
--from repo='fedora-multimedia' \
libheif \
libva \
libva-intel-media-driver \
libvdpau \
mesa-dri-drivers \
mesa-filesystem \
mesa-libEGL \
Expand All @@ -54,6 +52,14 @@ rpm-ostree override replace \
mesa-va-drivers \
mesa-vulkan-drivers

if [[ "$FEDORA_MAJOR_VERSION" -ne "41" ]]; then
rpm-ostree override replace \
--experimental \
--from repo='fedora-multimedia' \
libheif \
libvdpau
fi

# run common packages script
/ctx/packages.sh

Expand Down
31 changes: 20 additions & 11 deletions packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"grub2-tools-extra",
"heif-pixbuf-loader",
"htop",
"intel-vaapi-driver",
"just",
"kernel-tools",
"libcamera",
Expand All @@ -40,7 +39,6 @@
"pam-u2f",
"pam_yubico",
"pamu2fcfg",
"pipewire-libs-extra",
"pipewire-plugin-libcamera",
"powerstat",
"smartmontools",
Expand Down Expand Up @@ -92,7 +90,8 @@
"libavutil-free",
"libpostproc-free",
"libswresample-free",
"libswscale-free"
"libswscale-free",
"default-fonts-cjk-sans"
],
"kinoite": [
"ffmpegthumbnailer",
Expand All @@ -107,30 +106,40 @@
"39": {
"include": {
"all": [
"bootc"
"bootc",
"intel-vaapi-driver",
"pipewire-libs-extra"
],
"kinoite": [
"xwaylandvideobridge"
]
},
"exclude": {
"all": [
"default-fonts-cjk-sans"
]
"all": []
}
},
"40": {
"include": {
"all": [],
"all": [
"intel-vaapi-driver",
"pipewire-libs-extra"
],
"kinoite": [
"kf6-kimageformats",
"qt6-qtimageformats"
]
},
"exclude": {
"all": [
"default-fonts-cjk-sans"
]
"all": []
}
},
"41": {
"include": {
"all": [],
"kinoite": []
},
"exclude": {
"all": []
}
}
}

0 comments on commit f959353

Please sign in to comment.