Skip to content

Commit

Permalink
feat: Enable Nvidia driver builds for v535 (#122)
Browse files Browse the repository at this point in the history
* Enable driver builds for v535

* Remove v520 and v525 since they aren't being built for either supported Fedora version

* Enable push-ghcr to build v535

* The packages for v535 are included in Fedora 37

* remove testing repos from builds

* reset akmod-nvidia package filters

* Set F38 v535 as defaults in Containerfiles

* exclude F37 v530 builds
  • Loading branch information
p5 committed Jun 24, 2023
1 parent 1f6d6f2 commit fc8c211
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 27 deletions.
29 changes: 7 additions & 22 deletions .github/workflows/build.yml
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]
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
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
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
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

0 comments on commit fc8c211

Please sign in to comment.