From 42e52e93e75dbbb25d2c347f47ba81fcca883c02 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Fri, 1 Aug 2025 21:09:36 -0400 Subject: [PATCH] deprecate-nvidia-use-github (#50) Reviewed-on: https://git.hydrosaber.com/eriq12/hydro-os/pulls/50 Co-authored-by: Eriq Taing Co-committed-by: Eriq Taing --- .../{build-nvidia.yml => build-pr-test.yml} | 12 ++++++--- .github/workflows/build.yml | 10 ++++---- cosign.pub | 4 +-- files/scripts/nvidia/installtoolkitpolicy.sh | 6 ----- files/scripts/nvidia/removeunusedrepos.sh | 10 -------- files/scripts/nvidia/setdrmvariables.sh | 16 ------------ files/scripts/nvidia/setearlyloading.sh | 7 ------ recipes/components/nvidia-module.yml | 16 ------------ recipes/recipe_nvidia.yml | 25 ------------------- 9 files changed, 16 insertions(+), 90 deletions(-) rename .github/workflows/{build-nvidia.yml => build-pr-test.yml} (78%) delete mode 100644 files/scripts/nvidia/installtoolkitpolicy.sh delete mode 100644 files/scripts/nvidia/removeunusedrepos.sh delete mode 100644 files/scripts/nvidia/setdrmvariables.sh delete mode 100644 files/scripts/nvidia/setearlyloading.sh delete mode 100644 recipes/components/nvidia-module.yml delete mode 100644 recipes/recipe_nvidia.yml diff --git a/.github/workflows/build-nvidia.yml b/.github/workflows/build-pr-test.yml similarity index 78% rename from .github/workflows/build-nvidia.yml rename to .github/workflows/build-pr-test.yml index 007140d..9b484e3 100644 --- a/.github/workflows/build-nvidia.yml +++ b/.github/workflows/build-pr-test.yml @@ -1,6 +1,11 @@ -name: bluebuild-nvidia +name: bluebuild test pr on: + pull_request: workflow_dispatch: # allow manually triggering builds +concurrency: + # only run one build at a time + group: ${{ github.workflow }}-${{ github.ref || github.run_id }} + cancel-in-progress: true jobs: bluebuild: name: Build Custom Image @@ -14,8 +19,9 @@ jobs: matrix: recipe: # !! Add your recipes here - - recipe_nvidia.yml + - recipe.yml steps: + # the build is fully handled by the reusable github action - name: Build Custom Image uses: blue-build/github-action@v1.8 @@ -27,4 +33,4 @@ jobs: pr_event_number: ${{ github.event.number }} # enabled by default, disable if your image is small and you want faster builds - maximize_build_space: true \ No newline at end of file + maximize_build_space: true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f18f61a..9afd0f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,12 +9,11 @@ on: - main paths-ignore: # don't rebuild if only documentation has changed - "**.md" - - ".github/workflows/build-nvidia.yml" - - "files/scripts/nvidia/**" - - "recipes/components/nvidia-module.yml" - - "recipes/recipe_nvidia.yml" - pull_request: workflow_dispatch: # allow manually triggering builds +concurrency: + # only run one build at a time + group: ${{ github.workflow }}-${{ github.ref || github.run_id }} + cancel-in-progress: true jobs: bluebuild: name: Build Custom Image @@ -43,3 +42,4 @@ jobs: # enabled by default, disable if your image is small and you want faster builds maximize_build_space: true + rechunk: true diff --git a/cosign.pub b/cosign.pub index 1441be4..00560d1 100644 --- a/cosign.pub +++ b/cosign.pub @@ -1,4 +1,4 @@ -----BEGIN PUBLIC KEY----- -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEzzK2nfqN5MlTqBitNsehDVnITGSF -r9FQRKI6dNDXRjlKgcMaa88Mb9FdfqFVHSPesN1mHz3/QfZIPG/s7mJAfw== +MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEDgbLqIZdNv3Lx7jEKq3l6UImgXi/ +MdQ51/79s4zfI2f4wQ8ran/sZO3y91hhsImytGqfSpNZmMV8T0rmOAAXkg== -----END PUBLIC KEY----- diff --git a/files/scripts/nvidia/installtoolkitpolicy.sh b/files/scripts/nvidia/installtoolkitpolicy.sh deleted file mode 100644 index c55ff44..0000000 --- a/files/scripts/nvidia/installtoolkitpolicy.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# Tell build process to exit if there are any errors. -set -oue pipefail - -semodule --verbose --install /usr/share/selinux/packages/nvidia-container.pp \ No newline at end of file diff --git a/files/scripts/nvidia/removeunusedrepos.sh b/files/scripts/nvidia/removeunusedrepos.sh deleted file mode 100644 index 7693d6c..0000000 --- a/files/scripts/nvidia/removeunusedrepos.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -# Tell build process to exit if there are any errors. -set -oue pipefail - -rm -f /etc/yum.repos.d/negativo17-fedora-nvidia.repo -rm -f /etc/yum.repos.d/negativo17-fedora-multimedia.repo -rm -f /etc/yum.repos.d/eyecantcu-supergfxctl.repo -rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo -rm -f /etc/yum.repos.d/nvidia-container-toolkit.repo \ No newline at end of file diff --git a/files/scripts/nvidia/setdrmvariables.sh b/files/scripts/nvidia/setdrmvariables.sh deleted file mode 100644 index 617d940..0000000 --- a/files/scripts/nvidia/setdrmvariables.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -# Tell build process to exit if there are any errors. -set -oue pipefail - - -echo ' - -# Nvidia modesetting support. Set to 0 or comment to disable kernel modesetting -# support. This must be disabled in case of SLI Mosaic. - -options nvidia-drm modeset=1 fbdev=1 - -' > /usr/lib/modprobe.d/nvidia-modeset.conf - -cp /usr/lib/modprobe.d/nvidia-modeset.conf /etc/modprobe.d/nvidia-modeset.conf \ No newline at end of file diff --git a/files/scripts/nvidia/setearlyloading.sh b/files/scripts/nvidia/setearlyloading.sh deleted file mode 100644 index 19ec951..0000000 --- a/files/scripts/nvidia/setearlyloading.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Tell build process to exit if there are any errors. -set -oue pipefail - -sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf -sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf diff --git a/recipes/components/nvidia-module.yml b/recipes/components/nvidia-module.yml deleted file mode 100644 index b561b75..0000000 --- a/recipes/components/nvidia-module.yml +++ /dev/null @@ -1,16 +0,0 @@ -modules: - - type: containerfile - snippets: - - COPY --from=ghcr.io/ublue-os/akmods-nvidia:main-42 /rpms/ /tmp/rpms - - RUN find /tmp/rpms - - RUN rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm - - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo - - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo - - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm libnvidia-fbc libva-nvidia-driver nvidia-driver nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-container-toolkit - - - type: script - scripts: - - nvidia/installtoolkitpolicy.sh - - nvidia/removeunusedrepos.sh - - nvidia/setearlyloading.sh - - nvidia/setdrmvariables.sh \ No newline at end of file diff --git a/recipes/recipe_nvidia.yml b/recipes/recipe_nvidia.yml deleted file mode 100644 index bb4008e..0000000 --- a/recipes/recipe_nvidia.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json -# image will be published to ghcr.io// -name: hydro-os-nvidia -# description will be included in the image's metadata -description: This is my personal OS image. - -# the base image to build on top of (FROM) and the version tag to use -base-image: quay.io/fedora-ostree-desktops/base-atomic -image-version: 42 # latest is also supported if you want new updates ASAP - -# module configuration, executed in order -# you can include multiple instances of the same module -modules: - - from-file: components/dnf-module.yml - - from-file: components/script-module.yml - - from-file: components/sys-files-module.yml - - from-file: components/systemd-module.yml - - from-file: components/nvidia-module.yml - - from-file: components/default-flatpak.yml - - from-file: components/chezmoi-module.yml - - type: initramfs - - - type: signing -