Skip to content

Commit 0524a13

Browse files
inffyrenner0e
inffy
and
renner0e
authored
chore: drop HWE + nvidia-legacy images (#763)
* chore: drop HWE images This shouldn't be merged befora F43 images have released * justfile fixes * chore: remove hwe bazzite kernel logic * docs: remove HWE badge from README * update initramfs script to match main now Co-authored-by: renner <80410025+renner0e@users.noreply.github.com> * fix: remove leftover QUALIFIED_KERNEL * update copilot instructions * remove nvidia-legacy too * remove legacy-nvidia * more legacy-nvidia found * oops * chore(ci): remove hwe workflow * chore(just): remove nvidia closed from retagger * chore: remove nvidia closed from image-info.sh --------- Co-authored-by: renner <renner0@posteo.de> Co-authored-by: renner <80410025+renner0e@users.noreply.github.com>
1 parent 2e2f1d8 commit 0524a13

13 files changed

Lines changed: 18 additions & 193 deletions

‎.github/changelogs.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
IMAGE_MATRIX_LATEST = {
1212
"experience": ["base", "dx"],
13-
"image_flavor": ["main", "nvidia", "hwe", "hwe-nvidia"],
13+
"image_flavor": ["main", "nvidia"],
1414
}
1515
IMAGE_MATRIX = {
1616
"experience": ["base", "dx"],
@@ -33,7 +33,7 @@
3333
"dx": "### [Dev Experience Images](https://docs.projectbluefin.io/bluefin-dx)\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n",
3434
"kde": "### [Aurora Images](https://getaurora.dev/)\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n",
3535
"nvidia": "### Nvidia Images\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n",
36-
"hwe": "### HWE Images\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n",
36+
3737
}
3838

3939
COMMITS_FORMAT = "### Commits\n| Hash | Subject | Author |\n| --- | --- | --- |{commits}\n\n"
@@ -207,8 +207,7 @@ def get_package_groups(target: str, prev: dict[str, Any], manifests: dict[str, A
207207
if img not in pkg:
208208
continue
209209

210-
if t == "hwe" and "hwe" not in image_flavor:
211-
continue
210+
212211
if t == "nvidia" and "nvidia" not in image_flavor:
213212
continue
214213
if t == "base" and experience != "base":

‎.github/copilot-instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This document provides essential information for coding agents working with the
3535
### Architecture
3636

3737
- **Two Build Targets**: `base` (regular users) and `dx` (developer experience)
38-
- **Image Flavors**: main, nvidia, nvidia-open, hwe variants, asus, surface
38+
- **Image Flavors**: main, nvidia-open
3939
- **Fedora Versions**: 42, 43 supported
4040
- **Build Process**: Sequential shell scripts in build_files/ directory
4141

‎.github/workflows/build-image-latest-hwe.yml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎.github/workflows/build-image-latest-main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
matrix:
2727
brand_name: ["aurora"]
2828
with:
29-
image_flavors: '["main", "nvidia", "nvidia-open"]'
29+
image_flavors: '["main", "nvidia-open"]'
3030
brand_name: ${{ matrix.brand_name }}
3131
stream_name: latest
3232
#kernel_pin: 6.12.15-200.fc41.x86_64

‎.github/workflows/build-images.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ jobs:
1414
build-image-latest-main:
1515
uses: ./.github/workflows/build-image-latest-main.yml
1616
secrets: inherit
17-
build-image-latest-hwe:
18-
uses: ./.github/workflows/build-image-latest-hwe.yml
19-
secrets: inherit
2017
# build-image-beta:
2118
# uses: ./.github/workflows/build-image-beta.yml
2219
# secrets: inherit
20+

‎.github/workflows/reusable-build.yml‎

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ on:
33
workflow_call:
44
inputs:
55
image_flavors:
6-
description: "JSON string of flavors to build, '[main, nvidia, hwe, hwe-nvidia]'"
7-
default: "['main', 'nvidia', 'nvidia-open']"
6+
description: "JSON string of flavors to build, '[main, nvidia-open]'"
7+
default: "['main','nvidia-open']"
88
type: string
99
brand_name:
1010
description: "The Brand Name: aurora"
@@ -189,17 +189,7 @@ jobs:
189189
sudo -E podman push ${{ env.IMAGE_NAME }}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${tag}
190190
done
191191
192-
if [[ "${{ matrix.image_flavor }}" =~ hwe ]]; then
193192
194-
image_name="${{ env.IMAGE_NAME }}"
195-
asus_name="${image_name/hwe/asus}"
196-
surface_name="${image_name/hwe/surface}"
197-
198-
for tag in ${{ steps.generate-tags.outputs.alias_tags }}; do
199-
sudo -E podman push ${asus_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${asus_name}:${tag}
200-
sudo -E podman push ${surface_name}:${tag} ${{ steps.registry_case.outputs.lowercase }}/${surface_name}:${tag}
201-
done
202-
fi
203193
204194
digest=$(skopeo inspect docker://${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${{ env.DEFAULT_TAG }} --format '{{.Digest}}')
205195
@@ -218,19 +208,7 @@ jobs:
218208
COSIGN_EXPERIMENTAL: false
219209
COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}
220210

221-
- name: Sign container image
222-
if: github.event_name != 'pull_request' && contains(matrix.image_flavor, 'hwe')
223-
shell: bash
224-
run: |
225-
image_name="${{ env.IMAGE_NAME }}"
226-
asus_name="${image_name/hwe/asus}"
227-
surface_name="${image_name/hwe/surface}"
228-
cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${asus_name}@${TAGS}
229-
cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${surface_name}@${TAGS}
230-
env:
231-
TAGS: ${{ steps.push.outputs.outputs && fromJSON(steps.push.outputs.outputs).digest }}
232-
COSIGN_EXPERIMENTAL: false
233-
COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}
211+
234212

235213
- name: Add SBOM Attestation
236214
if: false

‎Justfile‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@ images := '(
77
)'
88
flavors := '(
99
[main]=main
10-
[nvidia]=nvidia
1110
[nvidia-open]=nvidia-open
12-
[hwe]=hwe
13-
[hwe-nvidia]=hwe-nvidia
14-
[hwe-nvidia-open]=hwe-nvidia-open
15-
[asus]=asus
16-
[asus-nvidia]=asus-nvidia
17-
[asus-nvidia-open]=asus-nvidia-open
18-
[surface]=surface
19-
[surface-nvidia]=surface-nvidia
20-
[surface-nvidia-open]=surface-nvidia-open
2111
)'
2212
tags := '(
2313
[stable]=stable
@@ -99,10 +89,6 @@ validate $image $tag $flavor:
9989
echo "Invalid flavor..."
10090
exit 1
10191
fi
102-
if [[ ! "$checktag" =~ latest && "$checkflavor" =~ hwe|asus|surface ]]; then
103-
echo "HWE images are only built on latest..."
104-
exit 1
105-
fi
10692

10793
# Build Image
10894
[group('Image')]
@@ -129,9 +115,7 @@ build $image="aurora" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipeline
129115
fi
130116

131117
# AKMODS Flavor and Kernel Version
132-
if [[ "${flavor}" =~ hwe ]]; then
133-
akmods_flavor="bazzite"
134-
elif [[ "${tag}" =~ stable ]]; then
118+
if [[ "${tag}" =~ stable ]]; then
135119
akmods_flavor="coreos-stable"
136120
elif [[ "${tag}" =~ beta ]]; then
137121
akmods_flavor="main"
@@ -162,8 +146,6 @@ build $image="aurora" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipeline
162146
fi
163147
if [[ "${flavor}" =~ nvidia-open ]]; then
164148
{{ just }} verify-container "akmods-nvidia-open:${akmods_flavor}-${fedora_version}-${kernel_release}"
165-
elif [[ "${flavor}" =~ nvidia ]]; then
166-
{{ just }} verify-container "akmods-nvidia:${akmods_flavor}-${fedora_version}-${kernel_release}"
167149
fi
168150

169151
# Get Version
@@ -873,18 +855,7 @@ tag-images image_name="" default_tag="" tags="":
873855
${PODMAN} tag $IMAGE {{ image_name }}:${tag}
874856
done
875857

876-
# HWE Tagging
877-
if [[ "{{ image_name }}" =~ hwe ]]; then
878858

879-
image_name="{{ image_name }}"
880-
asus_name="${image_name/hwe/asus}"
881-
surface_name="${image_name/hwe/surface}"
882-
883-
for tag in {{ tags }}; do
884-
${PODMAN} tag "${IMAGE}" "${asus_name}":${tag}
885-
${PODMAN} tag "${IMAGE}" "${surface_name}":${tag}
886-
done
887-
fi
888859

889860
# Show Images
890861
${PODMAN} images
@@ -910,6 +881,6 @@ retag-nvidia-on-ghcr working_tag="" stream="" dry_run="1":
910881
echo "$GITHUB_PAT" | podman login -u $GITHUB_USERNAME --password-stdin ghcr.io
911882
skopeo="skopeo"
912883
fi
913-
for image in aurora-nvidia-open aurora-nvidia aurora-dx-nvidia aurora-dx-nvidia-open; do
884+
for image in aurora-nvidia-open aurora-dx-nvidia-open; do
914885
$skopeo copy docker://ghcr.io/ublue-os/${image}:{{ working_tag }} docker://ghcr.io/ublue-os/${image}:{{ stream }}
915886
done

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Aurora
22

33
[![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)
4-
[![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)
4+
[![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)
55

66
[![LFX Active Contributors](https://insights.linuxfoundation.org/api/badge/active-contributors?project=aurora&repos=https://github.com/ublue-os/aurora)](https://insights.linuxfoundation.org/project/aurora)
77

‎build_files/base/00-image-info.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME"
1818

1919
# Image Flavor
2020
image_flavor="main"
21-
if [[ "${IMAGE_NAME}" =~ nvidia ]]; then
22-
image_flavor="nvidia"
23-
fi
2421
if [[ "${IMAGE_NAME}" =~ nvidia-open ]]; then
2522
image_flavor="nvidia-open"
2623
fi

‎build_files/base/09-hwe-additions.sh‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)