From e42e63c9a6d900d4e11df4d8284c9e18ddab201c Mon Sep 17 00:00:00 2001 From: Barrett Williamson Date: Sun, 15 Sep 2024 21:01:48 -0400 Subject: [PATCH] update branding --- .github/workflows/build-39.yml | 2 +- .github/workflows/build-40.yml | 2 +- .github/workflows/reusable-build.yml | 8 ++++---- boot_menu.yml | 22 +++------------------- emeritus.md | 11 ----------- just_scripts/build-iso-installer-main.sh | 4 ++-- just_scripts/build-iso.sh | 4 ++-- 7 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 emeritus.md diff --git a/.github/workflows/build-39.yml b/.github/workflows/build-39.yml index 5c6a6126..a78df8da 100644 --- a/.github/workflows/build-39.yml +++ b/.github/workflows/build-39.yml @@ -1,4 +1,4 @@ -name: ublue main 39 +name: main 39 on: pull_request: merge_group: diff --git a/.github/workflows/build-40.yml b/.github/workflows/build-40.yml index bf2de37b..d4fca366 100644 --- a/.github/workflows/build-40.yml +++ b/.github/workflows/build-40.yml @@ -1,4 +1,4 @@ -name: ublue main 40 +name: main 40 on: pull_request: merge_group: diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 483a78c5..d322cbf3 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -1,4 +1,4 @@ -name: build-ublue +name: build-main on: workflow_call: inputs: @@ -14,7 +14,7 @@ concurrency: cancel-in-progress: true jobs: - build_ublue: + build_main: name: main runs-on: ubuntu-24.04 permissions: @@ -275,10 +275,10 @@ jobs: name: Check all ${{ inputs.fedora_version }} builds successful if: ${{ !cancelled() }} runs-on: ubuntu-latest - needs: [build_ublue] + needs: [build_main] steps: - name: Exit on failure - if: ${{ needs.build_ublue.result == 'failure' }} + if: ${{ needs.build_main.result == 'failure' }} shell: bash run: exit 1 - name: Exit diff --git a/boot_menu.yml b/boot_menu.yml index e3c92bb3..bf31876e 100644 --- a/boot_menu.yml +++ b/boot_menu.yml @@ -1,5 +1,5 @@ ublue_variants: - - label: ublue-os/main + - label: sd/main ks: /kickstart/ublue-os.ks flavors: - label: silverblue-main @@ -16,7 +16,7 @@ ublue_variants: - label: mate-main - label: base-main info: no DE - - label: ublue-os/nvidia + - label: sd/nvidia ks: /kickstart/ublue-os-nvidia.ks subvariants: - label: latest driver @@ -36,20 +36,4 @@ ublue_variants: - label: lxqt-nvidia - label: mate-nvidia - label: base-nvidia - info: no DE - - label: ublue-os/bluefin - ks: /kickstart/ublue-os.ks - flavors: - - label: bluefin - info: Bluefin - - label: bluefin-nvidia - info: Bluefin for Nvidia - - label: bluefin-framework - info: Bluefin for Framework Laptops - - label: bluefin-dx - info: Bluefin Developer Experience - - label: bluefin-dx-nvidia - info: Bluefin Developer Experience for Nvidia - - label: bluefin-dx-framework - info: Bluefin Developer Experience for Framework Laptops - ks: /kickstart/ublue-os-nvidia.ks + info: no DE \ No newline at end of file diff --git a/emeritus.md b/emeritus.md deleted file mode 100644 index 2aa1e9f8..00000000 --- a/emeritus.md +++ /dev/null @@ -1,11 +0,0 @@ -# Note: This should just be part of CODEOWNERS but we're too lazy to implement that, someone send a PR. - -# Universal Blue Contributors Emeritus - -Universal Blue strives for sustainability. As such it is expected for people to dip in and out of membership. - -The following contributors have become legend, forever enshrined as masters of automation: - -- [@bigpod98](https://github.com/bigpod98) -- [@bobslept](https://github.com/bobslept) -- [@akdev1l](https://github.com/akdevl1) diff --git a/just_scripts/build-iso-installer-main.sh b/just_scripts/build-iso-installer-main.sh index 22e97c3b..5ea9228f 100755 --- a/just_scripts/build-iso-installer-main.sh +++ b/just_scripts/build-iso-installer-main.sh @@ -76,11 +76,11 @@ ${container_mgr} run --rm --privileged \ ARCH="x86_64" \ ENABLE_CACHE_DNF="false" \ ENABLE_CACHE_SKOPEO="false" \ - ENROLLMENT_PASSWORD="ublue-os" \ + ENROLLMENT_PASSWORD="sociallydistant" \ IMAGE_NAME="${tag}" \ IMAGE_REPO="localhost" \ IMAGE_TAG="${version}-${git_branch}" \ ISO_NAME="build/${tag}-${version}-${git_branch}.iso" \ - SECURE_BOOT_KEY_URL='https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' \ + SECURE_BOOT_KEY_URL='https://github.com/apoordev/kernel-cache/raw/main/certs/public_key.der' \ VARIANT="${variant}" \ VERSION="${version}" diff --git a/just_scripts/build-iso.sh b/just_scripts/build-iso.sh index c34f3416..dde53230 100755 --- a/just_scripts/build-iso.sh +++ b/just_scripts/build-iso.sh @@ -76,11 +76,11 @@ ${container_mgr} run --rm --privileged \ ARCH="x86_64" \ ENABLE_CACHE_DNF="false" \ ENABLE_CACHE_SKOPEO="false" \ - ENROLLMENT_PASSWORD="ublue-os" \ + ENROLLMENT_PASSWORD="sociallydistant" \ IMAGE_NAME="${tag}" \ IMAGE_REPO="localhost" \ IMAGE_TAG="${version}-${git_branch}" \ ISO_NAME="build/${tag}-${version}-${git_branch}.iso" \ - SECURE_BOOT_KEY_URL='https://github.com/ublue-os/akmods/raw/main/certs/public_key.der' \ + SECURE_BOOT_KEY_URL='https://github.com/apoordev/kernel-cache/raw/main/certs/public_key.der' \ VARIANT="${variant}" \ VERSION="${version}"