chore(ci): always replace kernel packages (#1752)

This commit is contained in:
Benjamin Sherman 2024-10-06 22:30:22 -05:00 committed by GitHub
parent 15ca3343a8
commit 0b40fe2f59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 16 deletions

View file

@ -116,7 +116,6 @@ jobs:
elif [[ "${{ matrix.image_flavor }}" == "main" && \
"${{ matrix.fedora_version }}" != "beta" ]]; then
echo "image_flavor=${{ matrix.image_flavor }}" >> $GITHUB_ENV
echo "nvidia_type=main" >> $GITHUB_ENV
else
echo "image_flavor=${{ matrix.image_flavor }}" >> $GITHUB_ENV
fi

View file

@ -2,14 +2,12 @@
set -eoux pipefail
if [[ -n "${NVIDIA_TYPE:-}" ]]; then
for pkg in kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra
do
rpm --erase $pkg --nodeps
done
for pkg in kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra
do
rpm --erase $pkg --nodeps
done
rpm-ostree install \
/tmp/kernel-rpms/kernel-[0-9]*.rpm \
/tmp/kernel-rpms/kernel-core-*.rpm \
/tmp/kernel-rpms/kernel-modules-*.rpm
fi
rpm-ostree install \
/tmp/kernel-rpms/kernel-[0-9]*.rpm \
/tmp/kernel-rpms/kernel-core-*.rpm \
/tmp/kernel-rpms/kernel-modules-*.rpm

View file

@ -2,11 +2,6 @@
set -ouex pipefail
# if [[ -n "${NVIDIA_TYPE:-}" ]]; then
# curl -L -o /etc/yum.repos.d/fedora-coreos-pool.repo \
# https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora-coreos-pool.repo
# fi
# Nvidia for gts/stable - nvidia
if [[ "${NVIDIA_TYPE}" == "nvidia" ]]; then
curl -Lo /tmp/nvidia-install.sh https://raw.githubusercontent.com/ublue-os/hwe/main/nvidia-install.sh && \