Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
EyeCantCU authored Dec 7, 2023
2 parents 76dcb1f + 0b07345 commit de17bdd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: build asus-nvidia
name: build surface-nvidia
on:
pull_request:
merge_group:
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
- mate
- onyx
major_version: [38, 39]
driver_version: [470, 545]
driver_version: [545]
include:
- major_version: 39
is_latest_version: true
Expand Down
6 changes: 3 additions & 3 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
ARG BASE_IMAGE="ghcr.io/ublue-os/${IMAGE_NAME}-asus"
ARG BASE_IMAGE="ghcr.io/ublue-os/${IMAGE_NAME}-surface"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"

FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS asus-nvidia
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS surface-nvidia

ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
ARG IMAGE_VENDOR="ublue-os"
Expand All @@ -14,7 +14,7 @@ COPY image-info.sh /tmp/image-info.sh
COPY install.sh /tmp/install.sh
COPY post-install.sh /tmp/post-install.sh

COPY --from=ghcr.io/ublue-os/akmods-nvidia:asus-${FEDORA_MAJOR_VERSION}-${NVIDIA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
COPY --from=ghcr.io/ublue-os/akmods-nvidia:surface-${FEDORA_MAJOR_VERSION}-${NVIDIA_MAJOR_VERSION} /rpms /tmp/akmods-rpms

RUN /tmp/image-info.sh && \
/tmp/install.sh && \
Expand Down

0 comments on commit de17bdd

Please sign in to comment.