From 22290f1b66af904f87b5c036f1a19c5d53d281c1 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Thu, 28 Sep 2023 08:56:54 -0600 Subject: [PATCH 01/14] chore(ci): Add pull bot --- .github/pull.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/pull.yml diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 00000000..44304f32 --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,6 @@ +version: "1" +rules: + - base: nvidia + upstream: ublue-os:nvidia + mergeMethod: merge + mergeUnstable: false From 3c52f6ffba724cdd7a94b3422c6ce30e910df9d1 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Thu, 28 Sep 2023 09:00:29 -0600 Subject: [PATCH 02/14] feat: Bringup ASUS Nvidia --- .github/workflows/build.yml | 4 ++-- Containerfile | 4 ++-- README.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84e70eed..590a2d9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,9 @@ -name: build-ublue +name: build asus-nvidia on: pull_request: merge_group: schedule: - - cron: '0 8 * * *' # 8:00am everyday (1 hr delay after 'main' builds) + - cron: '00 08 * * *' # 8:00am everyday (1 hr delay after 'main' builds) workflow_dispatch: env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} diff --git a/Containerfile b/Containerfile index ad5541ac..2e5c4038 100644 --- a/Containerfile +++ b/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:-38}" -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" diff --git a/README.md b/README.md index b2b2c8b3..ab2b5539 100644 --- a/README.md +++ b/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 From c272e3a060b18348eaf0843d07c9a4613e74b727 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Thu, 28 Sep 2023 09:07:43 -0600 Subject: [PATCH 03/14] chore(ci): Match ASUS image roster --- .github/workflows/build.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 590a2d9f..cf63c58b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,12 +22,16 @@ jobs: image_name: - silverblue - kinoite + - vauxite - sericea - - onyx - base - lxqt - mate - - vauxite + - bazzite + - bazzite-gnome + - bluefin + - bluefin-dx + - onyx major_version: [37, 38, 39] driver_version: [470, 535] include: @@ -46,17 +50,18 @@ jobs: is_stable_version: false is_gts_version: false 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 - # There is no Fedora 37 or 38 version of onyx + - image_name: bazzite + major_version: 39 + - image_name: bazzite-gnome + major_version: 39 + - image_name: vauxite + major_version: 39 - image_name: onyx major_version: 37 - image_name: onyx major_version: 38 - - image_name: vauxite - major_version: 39 steps: - name: Maximize build space uses: AdityaGarg8/remove-unwanted-software@v1 From ff4cd0193e9f9a06b60d08088059799fc8ec2e89 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Thu, 28 Sep 2023 09:11:34 -0600 Subject: [PATCH 04/14] chore(ci): Build at 10 AM --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf63c58b..953164b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: pull_request: merge_group: schedule: - - cron: '00 08 * * *' # 8:00am everyday (1 hr delay after 'main' builds) + - cron: '00 10 * * *' workflow_dispatch: env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} From 324844351a88a64cc26728091ebf1f2e10886489 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Thu, 28 Sep 2023 09:14:06 -0600 Subject: [PATCH 05/14] fix: Use ASUS akmods --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 2e5c4038..1d38d3d4 100644 --- a/Containerfile +++ b/Containerfile @@ -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 && \ From d6f8dd9d0093aecb0e0f44f69f027cab157673af Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Thu, 28 Sep 2023 09:19:56 -0600 Subject: [PATCH 06/14] fix(ci): Disable Fedora 37 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 953164b8..2e429e58 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: - bluefin - bluefin-dx - onyx - major_version: [37, 38, 39] + major_version: [38, 39] driver_version: [470, 535] include: - major_version: 37 From 6bacfe2c85f22bc11ae1a2573f1e2739b6a6892d Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Fri, 29 Sep 2023 10:26:08 -0600 Subject: [PATCH 07/14] chore(ci): Move Bazzite & Bluefin to their respective repos --- .github/workflows/build.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e429e58..876303a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,10 +27,6 @@ jobs: - base - lxqt - mate - - bazzite - - bazzite-gnome - - bluefin - - bluefin-dx - onyx major_version: [38, 39] driver_version: [470, 535] @@ -52,10 +48,6 @@ jobs: exclude: - image_name: sericea major_version: 37 - - image_name: bazzite - major_version: 39 - - image_name: bazzite-gnome - major_version: 39 - image_name: vauxite major_version: 39 - image_name: onyx From 8e7be07c340589c02105c6333def21e4d4181c24 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Fri, 29 Sep 2023 10:30:59 -0600 Subject: [PATCH 08/14] fix(ci): Remove Fedora 37 excludes/include --- .github/workflows/build.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 876303a0..5672bdd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,10 +31,6 @@ jobs: major_version: [38, 39] driver_version: [470, 535] include: - - major_version: 37 - is_latest_version: false - is_stable_version: true - is_gts_driver: false - major_version: 38 is_latest_version: true is_stable_version: true @@ -46,12 +42,8 @@ jobs: is_stable_version: false is_gts_version: false exclude: - - image_name: sericea - major_version: 37 - image_name: vauxite major_version: 39 - - image_name: onyx - major_version: 37 - image_name: onyx major_version: 38 steps: From 2b706f0a000cf975feb5386ff0c58a681261d954 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Sat, 30 Sep 2023 12:34:37 -0400 Subject: [PATCH 09/14] chore(ci): build at 8:30am --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5672bdd8..cee6101a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: pull_request: merge_group: schedule: - - cron: '00 10 * * *' + - cron: '30 08 * * *' # Build at 8:30am workflow_dispatch: env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} From c335287345ac834d3fd758087e86c8297881a486 Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Tue, 3 Oct 2023 12:15:51 +0200 Subject: [PATCH 10/14] chore(ci): switch to ublue-os fork of build space maximizer --- .github/workflows/build.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cee6101a..4059f3cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,11 +48,7 @@ jobs: major_version: 38 steps: - name: Maximize build space - uses: AdityaGarg8/remove-unwanted-software@v1 - with: - remove-dotnet: 'true' - remove-android: 'true' - remove-haskell: 'true' + uses: ublue-os/remove-unwanted-software@v6 # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action From 0d65add535570a0e06fe9bcd6155bc90b99f9514 Mon Sep 17 00:00:00 2001 From: Yevhen Popok Date: Thu, 19 Oct 2023 07:08:38 +0300 Subject: [PATCH 11/14] feat: turn on F39 for Vauxite Closes: https://github.com/ublue-os/main/issues/393 Complements: https://github.com/ublue-os/main/pull/392, https://github.com/ublue-os/nvidia/pull/164 Related discussion: https://github.com/orgs/ublue-os/discussions/237 --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4059f3cf..aa08805a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,8 +42,6 @@ jobs: is_stable_version: false is_gts_version: false exclude: - - image_name: vauxite - major_version: 39 - image_name: onyx major_version: 38 steps: From aa87aee3eb22ced03df6d1baadf71bf1a96f9675 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Sat, 28 Oct 2023 20:44:06 -0600 Subject: [PATCH 12/14] chore(ci): Build at 8:15 AM UTC 15 minutes following asus --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa08805a..a75ae950 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: pull_request: merge_group: schedule: - - cron: '30 08 * * *' # Build at 8:30am + - cron: '15 08 * * *' # Build at 8:15am workflow_dispatch: env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} From 73e330230e8567ca2c3666847410f71b72319ae5 Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Tue, 31 Oct 2023 21:22:31 -0600 Subject: [PATCH 13/14] chore(ci): Build at 4:10 PM UTC Move build schedule back for official images --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a75ae950..9aa806eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: pull_request: merge_group: schedule: - - cron: '15 08 * * *' # Build at 8:15am + - cron: '10 16 * * *' # Build at 16:10 UTC workflow_dispatch: env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} From 8d5b2e3e9621b77865912e87231f071615a4ea6c Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Fri, 10 Nov 2023 21:41:51 -0500 Subject: [PATCH 14/14] chore(ci): add concurrency to save build time --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02a64976..dbe77224 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,10 @@ on: 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