Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: enable fedora 41 builds #302

Merged
merged 3 commits into from
Oct 1, 2024
Merged

chore: enable fedora 41 builds #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05d3a18
chore: enable fedora 41 builds
p5 Oct 1, 2024
2b86115
fix: ptyxis is preinstalled with F41
p5 Oct 1, 2024
c81306f
fix: remove gnome-terminal-nautilus in F40 only
p5 Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
fedora-version: [40, stable]
fedora-version: [40, 41, stable]
base-image: [silverblue, cosmic]
permissions:
contents: read
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
strategy:
fail-fast: false
matrix:
fedora-version: [40, stable]
fedora-version: [40, 41, stable]
base-image: [silverblue, cosmic]
nvidia-type: [open]
permissions:
Expand Down
14 changes: 3 additions & 11 deletions lumina/scripts/_base/003-ptyxis-terminal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,7 @@ source /etc/os-release

FEDORA_VERSION=$VERSION_ID

if [[ "$FEDORA_VERSION" == "39" ]]; then
# Add the COPR repository
wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-$(rpm -E %fedora)/ublue-os-staging-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os_staging.repo
fi

# Install the package
rpm-ostree install ptyxis

# Check if the Fedora version is 39
if [[ "$FEDORA_VERSION" == "39" ]]; then
rm -rf /etc/yum.repos.d/_copr_ublue-os_staging.repo
if [[ "$FEDORA_VERSION" == "40" ]]; then
# Install the package
rpm-ostree install ptyxis
fi
9 changes: 7 additions & 2 deletions lumina/scripts/_silverblue/001-gnome-shell.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/env bash

set -euox pipefail
source /etc/os-release

FEDORA_VERSION=$VERSION_ID

wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-$(rpm -E %fedora)/ublue-os-staging-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os_staging.repo

Expand All @@ -10,11 +13,13 @@ rpm-ostree install \
gnome-shell-extension-blur-my-shell \
gnome-shell-extension-search-light \
gnome-shell-extension-caffeine \
yaru-theme \
gnome-tweaks \
libcanberra-gtk3 \
nautilus-open-any-terminal

sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.gnome.Terminal.desktop
if [[ "$FEDORA_VERSION" == "40" ]]; then
rpm-ostree install yaru-theme
sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.gnome.Terminal.desktop
fi

rm -rf /etc/yum.repos.d/_copr_ublue-os_staging.repo
8 changes: 7 additions & 1 deletion lumina/scripts/_silverblue/002-remove-gnome-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
#!/usr/bin/env bash

set -euox pipefail
source /etc/os-release

FEDORA_VERSION=$VERSION_ID

rpm-ostree override remove \
gnome-tour \
gnome-extensions-app \
gnome-system-monitor \
gnome-terminal-nautilus \
yelp

if [[ "$FEDORA_VERSION" == "40" ]]; then
rpm-ostree override remove gnome-terminal-nautilus
fi