Merge branch 'main' into main

.github/pull.yml

@@ -0,0 +1,6 @@
+version: "1"
+rules:
+  - base: nvidia
+    upstream: ublue-os:nvidia
+    mergeMethod: merge
+    mergeUnstable: false

.github/workflows/build.yml

@@ -1,13 +1,17 @@
-name: build-ublue
+name: build asus-nvidia
 on:
   pull_request:
   merge_group:
   schedule:
-    - cron: '30 15 * * *'  # 15:30 UTC everyday (30 min delay after 'main' builds)
+    - cron: '10 16 * * *' # Build at 16:10 UTC
   workflow_dispatch:
 env:
   IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   push-ghcr:
     name: nvidia image
@@ -22,25 +26,25 @@ jobs:
         image_name:
           - silverblue
           - kinoite
+          - vauxite
           - sericea
-          - onyx
           - base
           - lxqt
           - mate
-          - vauxite
+          - onyx
         major_version: [38, 39]
         driver_version: [470, 545]
         include:
+          - major_version: 39
+            is_latest_version: true
+            is_stable_version: true
+            is_gts_version: false
           - major_version: 38
             is_latest_version: false
             is_stable_version: true
             is_gts_driver: true
           - driver_version: 545
             is_latest_driver: true
-          - major_version: 39
-            is_latest_version: true
-            is_stable_version: true
-            is_gts_version: false
         exclude:
           # There is no Fedora 38 version of onyx
           - image_name: onyx

Containerfile

@@ -1,8 +1,8 @@
 ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
-ARG BASE_IMAGE="ghcr.io/ublue-os/${IMAGE_NAME}-main"
+ARG BASE_IMAGE="ghcr.io/ublue-os/${IMAGE_NAME}-asus"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
 
-FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS nvidia
+FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS asus-nvidia
 
 ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
 ARG IMAGE_VENDOR="ublue-os"
@@ -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:main-${FEDORA_MAJOR_VERSION}-${NVIDIA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
+COPY --from=ghcr.io/ublue-os/akmods-nvidia:asus-${FEDORA_MAJOR_VERSION}-${NVIDIA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
 
 RUN /tmp/image-info.sh && \
     /tmp/install.sh && \

README.md

@@ -1,8 +1,8 @@
-# Nvidia
+# ASUS Nvidia
 
-[![build-ublue](https://github.com/ublue-os/nvidia/actions/workflows/build.yml/badge.svg)](https://github.com/ublue-os/nvidia/actions/workflows/build.yml)
+[![build-ublue](https://github.com/ublue-os/asus-nvidia/actions/workflows/build.yml/badge.svg)](https://github.com/ublue-os/asus-nvidia/actions/workflows/build.yml)
 
-The purpose of these images is to provide [community Fedora images](https://github.com/ublue-os/main) with Nvidia drivers built-in. This approach can lead to greater reliability as failures can be caught at the build level instead of the client machine. This also allows for individual sets of images for each series of Nvidia drivers, allowing users to remain current with their OS but on an older, known working driver. Performance regression with a recent driver update? Reboot into a known-working driver after one command. That's the goal!
+The purpose of these images is to provide [community Fedora images](https://github.com/ublue-os/main) with ASUS hardware support and Nvidia drivers built-in. This approach can lead to greater reliability as failures can be caught at the build level instead of the client machine. This also allows for individual sets of images for each series of Nvidia drivers, allowing users to remain current with their OS but on an older, known working driver. Performance regression with a recent driver update? Reboot into a known-working driver after one command. That's the goal!
 
 # Documentation