From 21aca4ca224f8dcdbf4ef40e17586e2cf9b3bb48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 24 Nov 2024 22:54:25 -0500 Subject: [PATCH 1/3] build(deps): bump Wandalen/wretry.action from 3.5.0 to 3.7.2 (#299) Bumps [Wandalen/wretry.action](https://github.com/wandalen/wretry.action) from 3.5.0 to 3.7.2. - [Release notes](https://github.com/wandalen/wretry.action/releases) - [Commits](https://github.com/wandalen/wretry.action/compare/v3.5.0...v3.7.2) --- updated-dependencies: - dependency-name: Wandalen/wretry.action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/reusable-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 97e1d5a..e0edca0 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -169,7 +169,7 @@ jobs: - name: Get current version id: labels - uses: Wandalen/wretry.action@v3.5.0 + uses: Wandalen/wretry.action@v3.7.2 with: attempt_limit: 3 attempt_delay: 15000 @@ -191,7 +191,7 @@ jobs: echo "KERNEL_VERSION=$linux" >> $GITHUB_ENV - name: Pull main and akmods-nvidia images - uses: Wandalen/wretry.action@v3.5.0 + uses: Wandalen/wretry.action@v3.7.2 with: attempt_limit: 3 attempt_delay: 15000 @@ -267,7 +267,7 @@ jobs: # Push the image to GHCR (Image Registry) - name: Push To GHCR - uses: Wandalen/wretry.action@v3.5.0 + uses: Wandalen/wretry.action@v3.7.2 id: push if: github.event_name != 'pull_request' env: From 71bf347b434c498621ae7c059989cbe192702604 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Mon, 25 Nov 2024 10:13:35 -0600 Subject: [PATCH 2/3] chore(nvidia-install): Drop supergfxctl copr for staging (#302) * chore(nvidia-install): Drop supergfxctl copr for staging supergfxctl has been relocated to ublue's staging copr Signed-off-by: RJ Sampson * correct and cleanup nvidia addons repo enable/disable --------- Signed-off-by: RJ Sampson Co-authored-by: RJ Sampson --- nvidia-install.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/nvidia-install.sh b/nvidia-install.sh index 80073f2..d177218 100755 --- a/nvidia-install.sh +++ b/nvidia-install.sh @@ -12,11 +12,16 @@ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo ## nvidia install steps rpm-ostree install /tmp/akmods-rpms/ublue-os/ublue-os-nvidia-addons-*.rpm -# enables nvidia repos provided by ublue-os-nvidia-addons -sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/eyecantcu-supergfxctl.repo +# enable repo provided by ublue-os-nvidia-addons sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo -#NOTE: nvidia drivers are already provided by negativo17-fedora-multimedia.repo, no need to enable -#sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo + +# Enable staging for supergfxctl if repo file exists +if [[ -f /etc/yum.repos.d/_copr_ublue-os-staging.repo ]]; then + sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo +else + # Otherwise, retrieve the repo file for staging + curl -Lo /etc/yum.repos.d/_copr_ublue-os-staging.repo https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${RELEASE}"/ublue-os-staging-fedora-"${RELEASE}".repo +fi source /tmp/akmods-rpms/kmods/nvidia-vars @@ -43,8 +48,11 @@ rpm-ostree install \ ## nvidia post-install steps -# disables nvidia repos provided by ublue-os-nvidia-addons -sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/{eyecantcu-supergfxctl,negativo17-fedora-nvidia,nvidia-container-toolkit}.repo +# disable repo provided by ublue-os-nvidia-addons +sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/nvidia-container-toolkit.repo + +# Disable staging +sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo # ensure kernel.conf matches NVIDIA_FLAVOR (which must be nvidia or nvidia-open) # kmod-nvidia-common defaults to 'nvidia-open' but this will match our akmod image From 751bda99dc03b0d800925d3d0e15586a454ade2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 17:06:01 -0500 Subject: [PATCH 3/3] build(deps): bump Wandalen/wretry.action from 3.7.2 to 3.7.3 (#303) Bumps [Wandalen/wretry.action](https://github.com/wandalen/wretry.action) from 3.7.2 to 3.7.3. - [Release notes](https://github.com/wandalen/wretry.action/releases) - [Commits](https://github.com/wandalen/wretry.action/compare/v3.7.2...v3.7.3) --- updated-dependencies: - dependency-name: Wandalen/wretry.action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/reusable-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index e0edca0..88b24a4 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -169,7 +169,7 @@ jobs: - name: Get current version id: labels - uses: Wandalen/wretry.action@v3.7.2 + uses: Wandalen/wretry.action@v3.7.3 with: attempt_limit: 3 attempt_delay: 15000 @@ -191,7 +191,7 @@ jobs: echo "KERNEL_VERSION=$linux" >> $GITHUB_ENV - name: Pull main and akmods-nvidia images - uses: Wandalen/wretry.action@v3.7.2 + uses: Wandalen/wretry.action@v3.7.3 with: attempt_limit: 3 attempt_delay: 15000 @@ -267,7 +267,7 @@ jobs: # Push the image to GHCR (Image Registry) - name: Push To GHCR - uses: Wandalen/wretry.action@v3.7.2 + uses: Wandalen/wretry.action@v3.7.3 id: push if: github.event_name != 'pull_request' env: