Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove bluefin things #45

Merged
merged 6 commits into from
Dec 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Bug Report
description: Report an issue about using Bluefin
description: Report an issue about using Aurora
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Questions and Feedback
url: https://universal-blue.discourse.group/c/bluefin/6
url: https://universal-blue.discourse.group/c/aurora/11
about: Ask a question, share tips, and help others
35 changes: 7 additions & 28 deletions .github/changelogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,10 @@

IMAGE_MATRIX_LATEST = {
"experience": ["base", "dx"],
"de": ["kde", "gnome"],
"image_flavor": ["main", "nvidia", "hwe", "hwe-nvidia"],
}
IMAGE_MATRIX_GTS = {
"experience": ["base", "dx"],
"de": ["gnome"],
"image_flavor": ["main", "nvidia"],
}
IMAGE_MATRIX = {
"experience": ["base", "dx"],
"de": ["kde", "gnome"],
"image_flavor": ["main", "nvidia"],
}

Expand All @@ -39,13 +32,12 @@
"base": "### Base Images\n| | Name | Previous | New |\n| --- | --- | --- | --- |{changes}\n\n",
"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",
"gnome": "### [Bluefin Images](https://projectbluefin.io/)\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"
COMMIT_FORMAT = "\n| **[{short}](https://github.com/ublue-os/bluefin/commit/{githash})** | {subject} |"
COMMIT_FORMAT = "\n| **[{short}](https://github.com/ublue-os/aurora/commit/{githash})** | {subject} |"

CHANGELOG_TITLE = "{tag}: {pretty}"
CHANGELOG_FORMAT = """\
Expand All @@ -57,7 +49,6 @@
| Name | Version |
| --- | --- |
| **Kernel** | {pkgrel:kernel} |
| **Gnome** | {pkgrel:gnome-control-center-filesystem} |
| **KDE** | {pkgrel:plasma-desktop} |
| **Mesa** | {pkgrel:mesa-filesystem} |
| **Podman** | {pkgrel:podman} |
Expand Down Expand Up @@ -94,7 +85,6 @@

BLACKLIST_VERSIONS = [
"kernel",
"gnome-control-center-filesystem",
"plasma-desktop",
"mesa-filesystem",
"podman",
Expand All @@ -108,32 +98,25 @@
def get_images(target: str):
if "latest" in target:
matrix = IMAGE_MATRIX_LATEST
elif "gts" in target:
matrix = IMAGE_MATRIX_GTS
else:
matrix = IMAGE_MATRIX

for experience, de, image_flavor in product(*matrix.values()):
img = ""
if de == "gnome":
img += "bluefin"
elif de == "kde":
img += "aurora"

for experience, image_flavor in product(*matrix.values()):
img = "aurora"
if experience == "dx":
img += "-dx"

if image_flavor != "main":
img += "-"
img += image_flavor

yield img, experience, de, image_flavor
yield img, experience, image_flavor


def get_manifests(target: str):
out = {}
imgs = list(get_images(target))
for j, (img, _, _, _) in enumerate(imgs):
for j, (img, _, _) in enumerate(imgs):
output = None
print(f"Getting {img}:{target} manifest ({j+1}/{len(imgs)}).")
for i in range(RETRIES):
Expand Down Expand Up @@ -205,7 +188,7 @@ def get_package_groups(target: str, prev: dict[str, Any], manifests: dict[str, A

# Find common packages
first = True
for img, experience, de, image_flavor in get_images(target):
for img, experience, image_flavor in get_images(target):
if img not in pkg:
continue

Expand All @@ -222,18 +205,14 @@ def get_package_groups(target: str, prev: dict[str, Any], manifests: dict[str, A
# Find other packages
for t, other in others.items():
first = True
for img, experience, de, image_flavor in get_images(target):
for img, experience, image_flavor in get_images(target):
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 == "kde" and de != "kde":
continue
if t == "gnome" and de != "gnome":
continue
if t == "base" and experience != "base":
continue
if t == "dx" and experience != "dx":
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-iso-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
brand_name: ${{ fromJson(inputs.brand_name || '["bluefin", "aurora"]') }}
brand_name: ${{ fromJson(inputs.brand_name || '["aurora"]') }}
with:
image_flavors: '["main", "nvidia", "hwe", "hwe-nvidia"]'
brand_name: ${{ matrix.brand_name }}
Expand Down
14 changes: 7 additions & 7 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
ARG BASE_IMAGE_NAME="silverblue"
ARG BASE_IMAGE_NAME="kinoite"
ARG FEDORA_MAJOR_VERSION="40"
ARG SOURCE_IMAGE="${BASE_IMAGE_NAME}-main"
ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"

FROM scratch AS ctx
COPY / /

## bluefin image section
## aurora image section
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS base

ARG AKMODS_FLAVOR="coreos-stable"
ARG BASE_IMAGE_NAME="silverblue"
ARG BASE_IMAGE_NAME="kinoite"
ARG FEDORA_MAJOR_VERSION="40"
ARG IMAGE_NAME="bluefin"
ARG IMAGE_NAME="aurora"
ARG IMAGE_VENDOR="ublue-os"
ARG KERNEL="6.10.10-200.fc40.x86_64"
ARG SHA_HEAD_SHORT="dedbeef"
Expand All @@ -23,13 +23,13 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
--mount=type=bind,from=ctx,source=/,target=/ctx \
/ctx/build_files/shared/build-base.sh

## bluefin-dx developer edition image section
## aurora-dx developer edition image section
FROM base AS dx

ARG AKMODS_FLAVOR="coreos-stable"
ARG BASE_IMAGE_NAME="silverblue"
ARG BASE_IMAGE_NAME="kinoite"
ARG FEDORA_MAJOR_VERSION="40"
ARG IMAGE_NAME="bluefin-dx"
ARG IMAGE_NAME="aurora-dx"
ARG IMAGE_VENDOR="ublue-os"
ARG KERNEL="6.10.10-200.fc40.x86_64"
ARG SHA_HEAD_SHORT="dedbeef"
Expand Down
57 changes: 19 additions & 38 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ iso_builder_image := "ghcr.io/jasonn3/build-container-installer:v1.2.3"
images := '(
[aurora]=aurora
[aurora-dx]=aurora-dx
[bluefin]=bluefin
[bluefin-dx]=bluefin-dx
)'
flavors := '(
[main]=main
Expand All @@ -18,7 +16,6 @@ flavors := '(
[surface-nvidia]=surface-nvidia
)'
tags := '(
[gts]=gts
[stable]=stable
[latest]=latest
[beta]=beta
Expand Down Expand Up @@ -132,7 +129,7 @@ sudoif command *args:

# Build Image
[group('Image')]
build image="bluefin" tag="latest" flavor="main" rechunk="0" ghcr="0" pipeline="0" kernel_pin="":
build image="aurora" tag="latest" flavor="main" rechunk="0" ghcr="0" pipeline="0" kernel_pin="":
#!/usr/bin/bash
set -eoux pipefail
image={{ image }}
Expand All @@ -146,11 +143,7 @@ build image="bluefin" tag="latest" flavor="main" rechunk="0" ghcr="0" pipeline="
image_name=$(just image_name {{ image }} {{ tag }} {{ flavor }})

# Base Image
if [[ "${image}" =~ bluefin ]]; then
base_image_name="silverblue"
elif [[ "${image}" =~ aurora ]]; then
base_image_name="kinoite"
fi
base_image_name="kinoite"

# Target
if [[ "${image}" =~ dx ]]; then
Expand Down Expand Up @@ -245,12 +238,12 @@ build image="bluefin" tag="latest" flavor="main" rechunk="0" ghcr="0" pipeline="

# Build Image and Rechunk
[group('Image')]
build-rechunk image="bluefin" tag="latest" flavor="main" kernel_pin="":
build-rechunk image="aurora" tag="latest" flavor="main" kernel_pin="":
@just build {{ image }} {{ tag }} {{ flavor }} 1 0 0 {{ kernel_pin }}

# Build Image with GHCR Flag
[group('Image')]
build-ghcr image="bluefin" tag="latest" flavor="main" kernel_pin="":
build-ghcr image="aurora" tag="latest" flavor="main" kernel_pin="":
#!/usr/bin/bash
if [[ "${UID}" -gt "0" ]]; then
echo "Must Run with sudo or as root..."
Expand All @@ -260,7 +253,7 @@ build-ghcr image="bluefin" tag="latest" flavor="main" kernel_pin="":

# Build Image for Pipeline:
[group('Image')]
build-pipeline image="bluefin" tag="latest" flavor="main" kernel_pin="":
build-pipeline image="aurora" tag="latest" flavor="main" kernel_pin="":
#!/usr/bin/bash
if [[ "${UID}" -gt "0" ]]; then
echo "Must Run with sudo or as root..."
Expand All @@ -271,7 +264,7 @@ build-pipeline image="bluefin" tag="latest" flavor="main" kernel_pin="":
# Rechunk Image
[group('Image')]
[private]
rechunk image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":
rechunk image="aurora" tag="latest" flavor="main" ghcr="0" pipeline="0":
#!/usr/bin/bash
set -eoux pipefail

Expand Down Expand Up @@ -315,11 +308,7 @@ rechunk image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":

# Cleanup Space during Github Action
if [[ "{{ ghcr }}" == "1" ]]; then
if [[ "${image_name}" =~ bluefin ]]; then
base_image_name=silverblue-main
elif [[ "${image_name}" =~ aurora ]]; then
base_image_name=kinoite-main
fi
base_image_name=kinoite-main
if [[ "${tag}" =~ stable ]]; then
tag="stable-daily"
fi
Expand Down Expand Up @@ -405,7 +394,7 @@ rechunk image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":

# Load OCI into Podman Store
[group('Image')]
load-rechunk image="bluefin" tag="latest" flavor="main":
load-rechunk image="aurora" tag="latest" flavor="main":
#!/usr/bin/bash
set -eou pipefail

Expand All @@ -426,7 +415,7 @@ load-rechunk image="bluefin" tag="latest" flavor="main":

# Run Container
[group('Image')]
run image="bluefin" tag="latest" flavor="main":
run image="aurora" tag="latest" flavor="main":
#!/usr/bin/bash
set -eoux pipefail
image={{ image }}
Expand All @@ -450,7 +439,7 @@ run image="bluefin" tag="latest" flavor="main":

# Build ISO
[group('ISO')]
build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":
build-iso image="aurora" tag="latest" flavor="main" ghcr="0" pipeline="0":
#!/usr/bin/bash
set -eoux pipefail
image={{ image }}
Expand Down Expand Up @@ -493,12 +482,8 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":
just sudoif podman image scp "${UID}"@localhost::"${IMAGE_FULL}" root@localhost::"${IMAGE_FULL}"
fi

# Flatpak list for bluefin/aurora
if [[ "${image_name}" =~ bluefin ]]; then
FLATPAK_DIR_SHORTNAME="bluefin_flatpaks"
elif [[ "${image_name}" =~ aurora ]]; then
FLATPAK_DIR_SHORTNAME="aurora_flatpaks"
fi
# Flatpaks list for aurora
FLATPAK_DIR_SHORTNAME="aurora_flatpaks"

# Generate Flatpak List
TEMP_FLATPAK_INSTALL_DIR="$(mktemp -d -p /tmp flatpak-XXXXX)"
Expand Down Expand Up @@ -570,11 +555,7 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":
iso_build_args+=(IMAGE_TAG="${tag}")
iso_build_args+=(ISO_NAME="/github/workspace/${build_dir}/${image_name}-${tag}.iso")
iso_build_args+=(SECURE_BOOT_KEY_URL="https://github.com/ublue-os/akmods/raw/main/certs/public_key.der")
if [[ "${image_name}" =~ bluefin ]]; then
iso_build_args+=(VARIANT="Silverblue")
else
iso_build_args+=(VARIANT="Kinoite")
fi
iso_build_args+=(VARIANT="Kinoite")
iso_build_args+=(VERSION="${FEDORA_VERSION}")
iso_build_args+=(WEB_UI="false")

Expand All @@ -588,12 +569,12 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":

# Build ISO using GHCR Image
[group('ISO')]
build-iso-ghcr image="bluefin" tag="latest" flavor="main":
build-iso-ghcr image="aurora" tag="latest" flavor="main":
@just build-iso {{ image }} {{ tag }} {{ flavor }} 1

# Run ISO
[group('ISO')]
run-iso image="bluefin" tag="latest" flavor="main":
run-iso image="aurora" tag="latest" flavor="main":
#!/usr/bin/bash
set -eoux pipefail
image={{ image }}
Expand Down Expand Up @@ -677,7 +658,7 @@ verify-container container="" registry="ghcr.io/ublue-os" key="":

# Secureboot Check
[group('Utility')]
secureboot image="bluefin" tag="latest" flavor="main":
secureboot image="aurora" tag="latest" flavor="main":
#!/usr/bin/bash
set -eoux pipefail
image={{ image }}
Expand Down Expand Up @@ -732,7 +713,7 @@ secureboot image="bluefin" tag="latest" flavor="main":
# Get Fedora Version of an image
[group('Utility')]
[private]
fedora_version image="bluefin" tag="latest" flavor="main" $kernel_pin="":
fedora_version image="aurora" tag="latest" flavor="main" $kernel_pin="":
#!/usr/bin/bash
set -eou pipefail
just validate {{ image }} {{ tag }} {{ flavor }}
Expand All @@ -753,7 +734,7 @@ fedora_version image="bluefin" tag="latest" flavor="main" $kernel_pin="":
# Image Name
[group('Utility')]
[private]
image_name image="bluefin" tag="latest" flavor="main":
image_name image="aurora" tag="latest" flavor="main":
#!/usr/bin/bash
set -eou pipefail
just validate {{ image }} {{ tag }} {{ flavor }}
Expand All @@ -766,7 +747,7 @@ image_name image="bluefin" tag="latest" flavor="main":

# Generate Tags
[group('Utility')]
generate-build-tags image="bluefin" tag="latest" flavor="main" kernel_pin="" ghcr="0" $version="" github_event="" github_number="":
generate-build-tags image="aurora" tag="latest" flavor="main" kernel_pin="" ghcr="0" $version="" github_event="" github_number="":
#!/usr/bin/bash
set -eou pipefail

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[![Codacy Badge](https://app.codacy.com/project/badge/Grade/2503a44c1105456483517f793af75ee7)](https://app.codacy.com/gh/ublue-os/bluefin/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)

[![GTS Images](https://github.com/ublue-os/bluefin/actions/workflows/build-image-gts.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-image-gts.yml)[![Stable Images](https://github.com/ublue-os/bluefin/actions/workflows/build-image-stable.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-image-stable.yml)[![Latest Images](https://github.com/ublue-os/bluefin/actions/workflows/build-image-latest.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-image-latest.yml)[![Beta Images](https://github.com/ublue-os/bluefin/actions/workflows/build-image-beta.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-image-beta.yml)
[![Stable Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-stable.yml/badge.svg)](https://github.com/ublue-os/bluefin/actions/workflows/build-image-stable.yml)[![Latest Images](https://github.com/ublue-os/aurora/actions/workflows/build-image-latest.yml/badge.svg)](https://github.com/ublue-os/aurora/actions/workflows/build-image-latest.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)

![aurora](https://github.com/user-attachments/assets/5d16c9fd-cdfa-49a0-bc03-b28026f8c6df)

Expand All @@ -15,8 +15,8 @@ Aurora is a delightful KDE desktop experience for end-users that are looking for

## Documentation

1. [Discussions and Announcements](https://universal-blue.discourse.group/c/bluefin/6) - strongly recommended!
2. [Documentation](https://docs.projectbluefin.io/)
1. [Discussions and Announcements](https://universal-blue.discourse.group/c/aurora/11) - strongly recommended!
2. [Documentation](https://docs.getaurora.dev/)
3. [Contributing Guide](https://docs.projectbluefin.io/contributing)

### Secure Boot
Expand Down Expand Up @@ -46,7 +46,7 @@ sudo mokutil --import public_key.der

## Star History

<a href="https://star-history.com/#ublue-os/bluefin&Date">
<a href="https://star-history.com/#ublue-os/aurora&Date">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=ublue-os/aurora&type=Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=ublue-os/aurora&type=Date" />
Expand Down
Loading
Loading