chore: drop HWE + nvidia-legacy images

.github/changelogs.py

@@ -10,7 +10,7 @@
 
 IMAGE_MATRIX_LATEST = {
     "experience": ["base", "dx"],
-    "image_flavor": ["main", "nvidia", "hwe", "hwe-nvidia"],
+    "image_flavor": ["main", "nvidia"],
 }
 IMAGE_MATRIX = {
     "experience": ["base", "dx"],
@@ -33,7 +33,7 @@
     "dx": "### [Dev Experience Images](https://docs.projectbluefin.io/bluefin-dx)\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n",
     "kde": "### [Aurora Images](https://getaurora.dev/)\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n",
     "nvidia": "### Nvidia Images\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n",
-    "hwe": "### HWE Images\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n",
+
 }
 
 COMMITS_FORMAT = "### Commits\n| Hash | Subject |\n| --- | --- |{commits}\n\n"
@@ -208,8 +208,7 @@ def get_package_groups(target: str, prev: dict[str, Any], manifests: dict[str, A
             if img not in pkg:
                 continue
 
-            if t == "hwe" and "hwe" not in image_flavor:
-                continue
+
             if t == "nvidia" and "nvidia" not in image_flavor:
                 continue
             if t == "base" and experience != "base":

.github/workflows/build-images.yml

@@ -14,9 +14,7 @@ jobs:
     build-image-latest-main:
         uses: ./.github/workflows/build-image-latest-main.yml
         secrets: inherit
-    build-image-latest-hwe:
-        uses: ./.github/workflows/build-image-latest-hwe.yml
-        secrets: inherit
 #    build-image-beta:
 #        uses: ./.github/workflows/build-image-beta.yml
 #        secrets: inherit
+

.github/workflows/clean.yml

@@ -17,7 +17,7 @@ jobs:
         uses: dataaxiom/ghcr-cleanup-action@cd0cdb900b5dbf3a6f2cc869f0dbb0b8211f50c4 # v1.0.16
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          packages: aurora,aurora-asus,aurora-asus-nvidia,aurora-dx,aurora-dx-asus,aurora-dx-hwe,aurora-dx-asus-nvidia,aurora-dx-hwe-nvidia,aurora-dx-nvidia,aurora-dx-surface,aurora-dx-surface-nvidia,aurora-hwe,aurora-hwe-nvidia,aurora-surface,aurora-nvidia,aurora-surface,aurora-surface-nvidia
+          packages: aurora,aurora-dx,aurora-dx-nvidia,aurora-nvidia
           older-than: 90 days
           delete-orphaned-images: true
           keep-n-tagged: 7

.github/workflows/reusable-build.yml

@@ -3,7 +3,7 @@ on:
   workflow_call:
     inputs:
       image_flavors:
-        description: "JSON string of flavors to build, '[main, nvidia, hwe, hwe-nvidia]'"
+        description: "JSON string of flavors to build, '[main, nvidia]'"
         default: "['main', 'nvidia', 'nvidia-open']"
         type: string
       brand_name:
@@ -189,17 +189,7 @@ jobs:
               sudo -E podman push ${{ env.IMAGE_NAME }}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${tag}
             done
 
-            if [[ "${{ matrix.image_flavor }}" =~ hwe ]]; then
 
-              image_name="${{ env.IMAGE_NAME }}"
-              asus_name="${image_name/hwe/asus}"
-              surface_name="${image_name/hwe/surface}"
-
-              for tag in ${{ steps.generate-tags.outputs.alias_tags }}; do
-                sudo -E podman push ${asus_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${asus_name}:${tag}
-                sudo -E podman push ${surface_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${surface_name}:${tag}
-              done
-            fi
 
             digest=$(skopeo inspect docker://${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${{ env.DEFAULT_TAG }} --format '{{.Digest}}')
 
@@ -218,19 +208,7 @@ jobs:
           COSIGN_EXPERIMENTAL: false
           COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}
 
-      - name: Sign container image
-        if: github.event_name != 'pull_request' && contains(matrix.image_flavor, 'hwe')
-        shell: bash
-        run: |
-          image_name="${{ env.IMAGE_NAME }}"
-          asus_name="${image_name/hwe/asus}"
-          surface_name="${image_name/hwe/surface}"
-          cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${asus_name}@${TAGS}
-          cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${surface_name}@${TAGS}
-        env:
-          TAGS: ${{ steps.push.outputs.outputs && fromJSON(steps.push.outputs.outputs).digest }}
-          COSIGN_EXPERIMENTAL: false
-          COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}
+
 
       - name: Add SBOM Attestation
         if: false

Justfile

@@ -9,15 +9,6 @@ flavors := '(
     [main]=main
     [nvidia]=nvidia
     [nvidia-open]=nvidia-open
-    [hwe]=hwe
-    [hwe-nvidia]=hwe-nvidia
-    [hwe-nvidia-open]=hwe-nvidia-open
-    [asus]=asus
-    [asus-nvidia]=asus-nvidia
-    [asus-nvidia-open]=asus-nvidia-open
-    [surface]=surface
-    [surface-nvidia]=surface-nvidia
-    [surface-nvidia-open]=surface-nvidia-open
 )'
 tags := '(
     [stable]=stable
@@ -99,10 +90,6 @@ validate $image $tag $flavor:
         echo "Invalid flavor..."
         exit 1
     fi
-    if [[ ! "$checktag" =~ latest && "$checkflavor" =~ hwe|asus|surface ]]; then
-        echo "HWE images are only built on latest..."
-        exit 1
-    fi
 
 # Build Image
 [group('Image')]
@@ -129,9 +116,7 @@ build $image="aurora" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipeline
     fi
 
     # AKMODS Flavor and Kernel Version
-    if [[ "${flavor}" =~ hwe ]]; then
-        akmods_flavor="bazzite"
-    elif [[ "${tag}" =~ stable ]]; then
+    if [[ "${tag}" =~ stable ]]; then
         akmods_flavor="coreos-stable"
     elif [[ "${tag}" =~ beta ]]; then
         akmods_flavor="main"
@@ -873,18 +858,7 @@ tag-images image_name="" default_tag="" tags="":
         ${PODMAN} tag $IMAGE {{ image_name }}:${tag}
     done
 
-    # HWE Tagging
-    if [[ "{{ image_name }}" =~ hwe ]]; then
 
-        image_name="{{ image_name }}"
-        asus_name="${image_name/hwe/asus}"
-        surface_name="${image_name/hwe/surface}"
-
-        for tag in {{ tags }}; do
-            ${PODMAN} tag "${IMAGE}" "${asus_name}":${tag}
-            ${PODMAN} tag "${IMAGE}" "${surface_name}":${tag}
-        done
-    fi
 
     # Show Images
     ${PODMAN} images

README.md

@@ -1,7 +1,8 @@
 # Aurora
 
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/a940189170c8456c85a75ea36edb32c7)](https://app.codacy.com/gh/ublue-os/aurora/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
-[![Stable Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-stable.yml/badge.svg)](https://github.com/ublue-os/aurora/actions/workflows/build-image-stable.yml) [![Latest Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-latest-main.yml/badge.svg)](https://github.com/ublue-os/aurora/actions/workflows/build-image-latest-main.yml) [![Latest Images HWE](https://github.com/ublue-os/aurora/actions/workflows/build-image-latest-hwe.yml/badge.svg)](https://github.com/ublue-os/aurora/actions/workflows/build-image-latest-hwe.yml) [![Beta Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-beta.yml/badge.svg)](https://github.com/ublue-os/aurora/actions/workflows/build-image-beta.yml) [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/ublue-os/aurora-docs) 
+[![Stable Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-stable.yml/badge.svg)](https://github.com/ublue-os/aurora/actions/workflows/build-image-stable.yml) [![Latest Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-latest-main.yml/badge.svg)](https://github.com/ublue-os/aurora/actions/workflows/build-image-latest-main.yml) [![Beta Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-beta.yml/badge.svg)](https://github.com/ublue-os/aurora/actions/workflows/build-image-beta.yml) [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/ublue-os/aurora-docs)
+
 
 [<img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/ublue-os/countme/main/badge-endpoints/aurora.json&label=Aurora&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAdCAYAAADLnm6HAAAABGdBTUEAALGPC%2FxhBQAAAAFzUkdCAdnJLH8AAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAuIwAALiMBeKU%2FdgAAAAd0SU1FB%2BkHDxYYCm25gikAAAR4SURBVEjHvVVpbFRlFD33e8t0CUKAIcGUxbTW1CAhMVFE1BqQ2haQHwwlSNmCJQRUIIW2aGFskdpWQWhCrRYVAkpmgli6IFARUBJM%2FKESQY0kYDRQEC20bwbe8l1%2FtNPOlO7J9P67753ce%2B65y0cYoL31QtnCoBRFrVKZYLA4HrTEqkPnXr2GQZoYCLgsbft0Ah8A4WEi6ASawwJHAC8NCQEFeJuIlPBvBHoy42n3vKgTqEwvmgaiZ7sNwsLr8XhEVAkQlNww97RjmylgGABAhMnBmzPnR41AdZo3kcFzQz7DfnPP2bxfJaGy4xvT1sGooPYHpKu0wWZSwADA35c25p8DANtx3gPEGgCxRHg0%2BF9aFuD%2FvD8x5xaemSKIZvY5vb70gtH3ROxVg5U4Qwq0SiVr64lNvtD%2FrGcqdgWk%2BhprCkhTL8WMODbJ7%2FfLbpNuOjlWcbkWsSKWEDAZzL%2F1qYDQtDWQiAMDDL7y960%2FvoicDbMcrK4C4AKQEmzNiFAhPX23rk6Y%2BJLQ9eUgZRaIlFDVTLB6VaBqdk7saDH2akAqbkMqaHFow8bjm3d2xc2eVlkFXckhTQV0canFuPLYcHdSstRcK0nXsilGdZNLA2I0kEsDBLXPEn%2FXqwLjNPeSoIS73b3jOLf3dodzYJUqUFa0zRSlDBuedJGhJhMBuK9EvsXAEUD6mvHNqR4JeFNTFQLldk45qvMbS%2B90C76BvzgB5wmY3tYXSo7MyTYD9XC4Wrt0%2Fbjfv8DqcwtSRz417y5TUptUsO%2Bxtbsr5uUnvMMcfeTaVqmtBfDgfbUCl8HYC0t%2BerQq7dqA1lABNnQWwL51X3mvhvz1U9fHmLEJq4OsFgQc4SZC24Z24k%2BxlDtjzcMN%2FoPdb0SvBH5YnP9cMEjTOqJKuxwAch7PURNGJS0PSLHFliIBTOFJTTA%2Bk8zvN9Qs%2FgkAMhcdHAH4mwd8CYUicsMin1h6rPjHPS9um%2F%2BIe%2BJFAj4EkBAGNxlcaUknsa5xxfL4%2BPoLmXP3z5%2FjOXRWQLsw1eOLGZACP68vnGT9KzNDokpG7f7MosYA0wxICu%2Bvzcz7YNnFdefXdbTnbvOs8RQnDhKggwhj4tXVAHb2WwFdVfIobHkEYRcRZkQONZ%2BxpT3lkzOvrzwUlhwAak%2B%2BcoWAjzqwRPmpHl98vwhcLitOIsbCyGeQRFjm61JydunXxvMfnN74S09BHcsuZnBL26XEmAdGxS3rFwGd8Aaoh81gruN75qStjXkHAC%2F31teGhmVNxFTBzN%2BCeQXMpn09P%2FPt1vRxyUPmLef3wA1bNW5YMFoZhlRgOMIKOErB5Xq5w9tH4sFYR7UKoZC6DiWzKZk92fVbjiJKJgDgdk1JIoGyuwyaKYEFntqiqCXvIKCrWh6F9Z4BloQFGV9uq0GUTQRPvjOOiJZ2OeI7Ug%2BXRD05AAhd1T0E6GHVX2y6eWczhsgECaRH7DDLgoxjFeaQEZCO3APwn6Fb5H9X1GIIjQDg%2Bv7yOM2xc41%2FbHv8xsLtQ0ngf4pt0%2FfhCzpDAAAAAElFTkSuQmCC%0A">](https://github.com/ublue-os/aurora)
 

build_files/base/03-install-kernel-akmods.sh

@@ -24,11 +24,6 @@ if [[ "$AKMODS_FLAVOR" = "main" && "$KERNEL" -ne $(rpm -q --queryformat="%{evr}.
   dnf5 -y install /tmp/kernel-rpms/kernel{,-core,-modules,-modules-core,-modules-extra}-"${KERNEL}".rpm
 fi
 
-# TODO: Remove this shit with F43
-if [[ "$AKMODS_FLAVOR" = "bazzite" ]]; then
-  dnf5 -y install /tmp/kernel-rpms/kernel{,-core,-modules,-modules-core,-modules-extra}-"${KERNEL}".rpm
-fi
-
 # Prevent kernel stuff from upgrading again
 dnf5 versionlock add kernel{,-core,-modules,-modules-core,-modules-extra,-tools,-tools-lib,-headers,-devel,-devel-matched}
 

build_files/base/19-initramfs.sh

@@ -4,11 +4,7 @@ echo "::group:: ===$(basename "$0")==="
 
 set -oue pipefail
 
-if [[ "${AKMODS_FLAVOR}" == "surface" ]]; then
-    KERNEL_SUFFIX="surface"
-else
-    KERNEL_SUFFIX=""
-fi
+KERNEL_SUFFIX=""
 
 QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(|'"$KERNEL_SUFFIX"'-)(\d+\.\d+\.\d+)' | sed -E 's/kernel-(|'"$KERNEL_SUFFIX"'-)//')"
 /usr/bin/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"

build_files/dx/02-install-kernel-akmods-dx.sh

@@ -29,11 +29,6 @@ if [[ "$AKMODS_FLAVOR" = "main" && "$KERNEL" -ne $(rpm -q --queryformat="%{evr}.
   dnf5 -y install /tmp/kernel-rpms/kernel{,-core,-modules,-modules-core,-modules-extra,-devel}-"${KERNEL}".rpm kernel-{tools,tools-libs}-"$KERNEL"
 fi
 
-# TODO: Remove this shit with F43
-if [[ "$AKMODS_FLAVOR" = "bazzite" ]]; then
-  dnf5 -y install /tmp/kernel-rpms/kernel{,-core,-modules,-modules-core,-modules-extra}-"${KERNEL}".rpm
-fi
-
 # Prevent kernel stuff from upgrading again
 dnf5 versionlock add kernel{,-core,-modules,-modules-core,-modules-extra,-tools,-tools-lib,-headers,-devel,-devel-matched}
 

build_files/shared/build-base.sh

@@ -46,8 +46,7 @@ echo "::endgroup::"
 # Get Firmare for Framework
 /ctx/build_files/base/08-firmware.sh
 
-# Make HWE changes
-/ctx/build_files/base/09-hwe-additions.sh
+
 
 # Bazaar workarounds
 /ctx/build_files/base/11-bazaar.sh