chore: attempt to fix rechunker complaint of multiple kernels (#1750)
This commit is contained in:
parent
bab923c17a
commit
1edf813eec
2 changed files with 5 additions and 3 deletions
2
.github/workflows/reusable-build.yml
vendored
2
.github/workflows/reusable-build.yml
vendored
|
|
@ -401,7 +401,7 @@ jobs:
|
|||
|
||||
- name: Rechunk Image
|
||||
id: rechunk
|
||||
if: inputs.rechunk == true && github.event_name != 'pull_request'
|
||||
if: inputs.rechunk == true && ( github.event_name == 'pull_request' && ( matrix.image_flavor == 'main' || matrix.image_flavor == 'nvidia' ) || github.event_name != 'pull_request' )
|
||||
uses: hhd-dev/rechunk@v0.8.6
|
||||
with:
|
||||
rechunk: ghcr.io/hhd-dev/rechunk:v0.8.6
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
set -eoux pipefail
|
||||
|
||||
if [[ -n "${NVIDIA_TYPE:-}" ]]; then
|
||||
rpm-ostree override remove \
|
||||
kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra
|
||||
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 \
|
||||
|
|
|
|||
Loading…
Reference in a new issue