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

Jump to bottom

feat: enable fedora 39 builds #301

Merged
merged 10 commits into from
Sep 19, 2023
Merged

feat: enable fedora 39 builds #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
26a5e6b
feature: enable fedora 39 builds
p5 Aug 13, 2023
1e675b4
Merge branch 'main' into enable-fedora-39-builds
p5 Sep 19, 2023
5afcab6
Update various files - disable vauxite F39, try to exclude raw-thumbn…
p5 Sep 19, 2023
8e766a3
Remove breakpoint
p5 Sep 19, 2023
18b6987
fix: Attempt to correct f39 raw-thumbnailer exclusion
EyeCantCU Sep 19, 2023
7629da7
feat: Introduce gts tag to track Fedora release - 1
EyeCantCU Sep 19, 2023
8503538
fix: Remove default-fonts-cjk-sans from f39
EyeCantCU Sep 19, 2023
2a042b4
fix: Exclude google-noto-sans-cjk-fonts from f39
EyeCantCU Sep 19, 2023
de3773e
fix(nvidia): Don't try to disable modular repos on f39
EyeCantCU Sep 19, 2023
a3fc8fd
fix(ci): Filter vauxite from f39 via image_name
EyeCantCU Sep 19, 2023
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
18 changes: 16 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,37 @@ jobs:
matrix:
image_flavor: [main, nvidia]
image_name: [silverblue, kinoite, vauxite, sericea, base, lxqt, mate]
major_version: [37, 38]
major_version: [37, 38, 39]
nvidia_version: [0, 470, 535]
include:
- major_version: 37
is_latest_version: false
is_stable_version: true
is_gts_version: false
- major_version: 38
is_latest_version: true
is_stable_version: true
is_gts_version: true
- major_version: 39
is_latest_version: true
Copy link
Member Author

@p5 p5 Sep 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember the decision - are we marking beta releases as the latest?

I seem to think we wanted latest to be the latest stable release, then ":stable" to be a few weeks late - once we've tested stuff?
I know it's confusing.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest and stable are required to push to the latest tag so the latest stable release is what gets pushed there. 39 won't get pushed to that until it is marked as stable. When that happens, we set the flag for latest and stable releases to false for 38 but keep gts true and that will be the release that stays behind. Setting the latest flag here for 39 won't have an impact on our tags as it isn't marked stable yet. I know that sounds confusing too

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Happy for this to be merged then

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Let's get this rolled out :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work y'all!!

is_stable_version: false
is_gts_version: false
- nvidia_version: 535
is_latest_nvidia: true
exclude:
# There is no Fedora 37 version of sericea
# When F38 is added, sericea will automatically be built too
- image_name: sericea
major_version: 37
- image_name: vauxite
major_version: 39
- image_flavor: main
nvidia_version: 470
- image_flavor: main
nvidia_version: 535
- image_flavor: nvidia
nvidia_version: 0
steps:
steps:
# Checkout push-to-registry action GitHub repository
- name: Checkout Push to Registry action
uses: actions/checkout@v4
Expand Down Expand Up @@ -103,6 +111,12 @@ jobs:
BUILD_TAGS+=("${TIMESTAMP}")
BUILD_TAGS+=("latest")
fi
elif [[ "${{ matrix.is_gts_version }}" == "true" ]]; then
if [[ "${{ matrix.image_flavor }}" == "main" ]] || \
[[ "${{ matrix.is_latest_nvidia }}" == "true" ]]; then
BUILD_TAGS+=("gts-${TIMESTAMP}")
BUILD_TAGS+=("gts")
fi
fi

if [[ "${{ github.event_name }}" == "pull_request" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
ARG SOURCE_IMAGE="${SOURCE_IMAGE:-silverblue}"
ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"


FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS main
ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"

COPY github-release-install.sh /tmp/github-release-install.sh
COPY main-install.sh /tmp/main-install.sh
Expand All @@ -29,7 +29,7 @@ RUN mkdir -p /var/tmp && chmod -R 1777 /var/tmp

FROM main AS nvidia
ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
ARG NVIDIA_MAJOR_VERSION="${NVIDIA_MAJOR_VERSION:-535}"

COPY nvidia-install.sh /tmp/nvidia-install.sh
Expand Down
15 changes: 9 additions & 6 deletions main-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@ for REPO in $(rpm -ql ublue-os-akmods-addons|grep ^"/etc"|grep repo$); do
sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' ${REPO}
done

rpm-ostree install \
/tmp/akmods-rpms/kmods/*openrazer*.rpm \
/tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
/tmp/akmods-rpms/kmods/*xpadneo*.rpm \
/tmp/akmods-rpms/kmods/*xone*.rpm \
/tmp/akmods-rpms/kmods/*xpad-noone*.rpm
# Only run if FEDORA_MAJOR_VERSION is not 39
if grep -qv "39" <<< $FEDORA_MAJOR_VERSION; then
rpm-ostree install \
/tmp/akmods-rpms/kmods/*xpadneo*.rpm \
/tmp/akmods-rpms/kmods/*xpad-noone*.rpm \
/tmp/akmods-rpms/kmods/*xone*.rpm \
/tmp/akmods-rpms/kmods/*openrazer*.rpm \
/tmp/akmods-rpms/kmods/*v4l2loopback*.rpm
fi

for REPO in $(rpm -ql ublue-os-akmods-addons|grep ^"/etc"|grep repo$); do
echo "akmods: disable per defaults: ${REPO}"
Expand Down
42 changes: 33 additions & 9 deletions main-packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"google-noto-sans-javanese-fonts",
"google-noto-sans-balinese-fonts",
"google-noto-sans-sundanese-fonts",
"google-noto-sans-cjk-fonts",
"nvme-cli",
"nvtop",
"openrgb-udev-rules",
Expand All @@ -45,8 +44,7 @@
],
"silverblue": [
"adw-gtk3-theme",
"gnome-tweaks",
"raw-thumbnailer"
"gnome-tweaks"
],
"kinoite": [
"icoutils",
Expand Down Expand Up @@ -175,7 +173,6 @@
"pipewire-alsa",
"pipewire-pulseaudio",
"pluma",
"raw-thumbnailer",
"seahorse",
"seahorse-caja",
"setroubleshoot",
Expand All @@ -193,7 +190,6 @@
"clipman"
],
"vauxite": [
"raw-thumbnailer",
"xfce4-clipman-plugin",
"xfce4-whiskermenu-plugin"
]
Expand Down Expand Up @@ -224,12 +220,21 @@
},
"37": {
"include": {
"all": [],
"all": [
"google-noto-sans-cjk-fonts"
],
"silverblue": [
"raw-thumbnailer"
],
"mate": [
"f37-backgrounds-base",
"f37-backgrounds-extras-base",
"f37-backgrounds-extras-mate",
"f37-backgrounds-mate"
"f37-backgrounds-mate",
"raw-thumbnailer"
],
"vauxite": [
"raw-thumbnailer"
]
},
"exclude": {
Expand All @@ -238,16 +243,35 @@
},
"38": {
"include": {
"all": [],
"all": [
"google-noto-sans-cjk-fonts"
],
"silverblue": [
"raw-thumbnailer"
],
"mate": [
"f38-backgrounds-base",
"f38-backgrounds-extras-base",
"f38-backgrounds-extras-mate",
"f38-backgrounds-mate"
"f38-backgrounds-mate",
"raw-thumbnailer"
],
"vauxite": [
"raw-thumbnailer"
]
},
"exclude": {
"all": []
}
},
"39": {
"include": {
"all": []
},
"exclude": {
"all": [
"default-fonts-cjk-sans"
]
}
}
}
6 changes: 5 additions & 1 deletion nvidia-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

set -ouex pipefail

sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo
if [[ "${FEDORA_MAJOR_VERSION}" -le 38 ]]; then
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo
else
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo
fi

rpm-ostree install \
/tmp/akmods-rpms/ublue-os/ublue-os-nvidia-addons-*.rpm
Expand Down