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

feat: Enable Nvidia driver builds for v535 #122

Merged
merged 8 commits into from
Jun 24, 2023
Merged

feat: Enable Nvidia driver builds for v535 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84086ba
Enable driver builds for v535
p5 Jun 18, 2023
5436932
Remove v520 and v525 since they aren't being built for either support…
p5 Jun 18, 2023
506cf8f
Enable push-ghcr to build v535
p5 Jun 18, 2023
a3cabb0
The packages for v535 are included in Fedora 37
p5 Jun 18, 2023
8a65dec
remove testing repos from builds
p5 Jun 23, 2023
eddc6c0
reset akmod-nvidia package filters
p5 Jun 23, 2023
b866d12
Set F38 v535 as defaults in Containerfiles
p5 Jun 23, 2023
182798f
exclude F37 v530 builds
p5 Jun 24, 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
29 changes: 7 additions & 22 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,12 @@ jobs:
fail-fast: false
matrix:
major_version: [37, 38]
driver_version: [520, 525, 530, 470]
driver_version: [470, 530, 535]
Copy link
Member Author

Choose a reason for hiding this comment

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

Removes the v520 and v525 drivers since they are being excluded for both Fedora versions

exclude:
- driver_version: 525
major_version: 37
- driver_version: 525
major_version: 38
- driver_version: 520
major_version: 37
- driver_version: 520
major_version: 38
- driver_version: 470
Copy link
Member

Choose a reason for hiding this comment

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

Exclude builds of 37 with driver version 530 here

- driver_version: 530
  major_version: 37

Copy link

@MiMillieuh MiMillieuh Jun 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

If you still wants some legacy in your version you can keep the 520 driver on fedora 37 cause it's the base driver so it will always be possible to build it.

However don't enable it on F38 cause the driver doesn't exists.

Copy link
Member Author

@p5 p5 Jun 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Changes made in 182798f

I don't think we need to worry about enabling an older driver version in this PR - this was mainly just getting the new ones to build. I was hoping this would be a non-breaking update, but it turns out it broke on it's own.

Copy link

Choose a reason for hiding this comment

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

Sure that's fine to keep the latest only.

I was just saying this so you know what's possible to do or not in the current situation it might help understanding for the future so that kind of issue won't happen any more.

major_version: 38
- driver_version: 530
major_version: 37
steps:
# Checkout push-to-registry action GitHub repository
- name: Checkout Push to Registry action
Expand Down Expand Up @@ -182,34 +176,25 @@ jobs:
matrix:
image_name: [silverblue, kinoite, vauxite, sericea, base, lxqt, mate]
major_version: [37, 38]
driver_version: [520, 525, 530, 470]
driver_version: [470, 530, 535]
include:
# - major_version: 36
# is_latest_version: false
# is_stable_version: true
- major_version: 37
is_latest_version: false
is_stable_version: true
- major_version: 38
is_latest_version: true
is_stable_version: true
- driver_version: 530
- driver_version: 535
is_latest_driver: 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
- driver_version: 525
major_version: 37
- driver_version: 525
major_version: 38
- driver_version: 520
major_version: 37
- driver_version: 520
major_version: 38
- driver_version: 470
major_version: 38
- driver_version: 530
major_version: 37
steps:
# Checkout push-to-registry action GitHub repository
- name: Checkout Push to Registry action
Expand Down
4 changes: 2 additions & 2 deletions build.Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
ARG BASE_IMAGE="ghcr.io/ublue-os/${IMAGE_NAME}-main"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-37}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"

FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS builder

ARG NVIDIA_MAJOR_VERSION="${NVIDIA_MAJOR_VERSION:-525}"
ARG NVIDIA_MAJOR_VERSION="${NVIDIA_MAJOR_VERSION:-535}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"

RUN ln -s /usr/bin/rpm-ostree /usr/bin/dnf
Expand Down
6 changes: 3 additions & 3 deletions install.Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ARG IMAGE_NAME=silverblue
ARG BASE_IMAGE=ghcr.io/ublue-os/${IMAGE_NAME}-main
ARG FEDORA_MAJOR_VERSION=37
ARG FEDORA_MAJOR_VERSION=38

FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION}

ARG IMAGE_NAME="${IMAGE_NAME}"
ARG AKMODS_CACHE="ghcr.io/ublue-os/akmods-nvidia"
ARG AKMODS_VERSION="37"
ARG AKMODS_VERSION="38"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
ARG NVIDIA_MAJOR_VERSION="525"
ARG NVIDIA_MAJOR_VERSION="535"

COPY --from=${AKMODS_CACHE}:${AKMODS_VERSION}-${NVIDIA_MAJOR_VERSION} / .

Expand Down