From 98daa44ff8f9b6a19d8f48ca74105559f5b847b8 Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Fri, 5 Sep 2025 18:03:59 -0400 Subject: [PATCH] Move base files to their own directory --- .gitlab-ci.yml | 12 ++++----- recipes/base-cosmic-nvidia.yml | 25 ++----------------- recipes/base-cosmic.yml | 25 +++---------------- recipes/base-kinoite-nvidia.yml | 15 +++-------- recipes/base-kinoite.yml | 13 +++------- .../base-common.yml => base/common.yml} | 0 recipes/base/cosmic.yml | 22 ++++++++++++++++ recipes/base/kinoite.yml | 9 +++++++ recipes/{common => base}/nvidia.yml | 0 9 files changed, 49 insertions(+), 72 deletions(-) rename recipes/{common/base-common.yml => base/common.yml} (100%) create mode 100644 recipes/base/cosmic.yml create mode 100644 recipes/base/kinoite.yml rename recipes/{common => base}/nvidia.yml (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 107d481..6417ec4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,8 +37,7 @@ variables: base-images: extends: - .build - # stage: base-images - stage: build + stage: base-images parallel: matrix: - RECIPE: @@ -46,16 +45,17 @@ base-images: - base-cosmic.yml - base-kinoite-nvidia.yml - base-cosmic-nvidia.yml - TAG: 519-device-or-resource-busy-when-trying-to-rechunk-the-image-in-gitlab-ci - # BB_BUILD_PUSH: 'true' + # TAG: 519-device-or-resource-busy-when-trying-to-rechunk-the-image-in-gitlab-ci + BB_BUILD_PUSH: 'true' + BB_CACHE_LAYERS: 'true' # BB_BUILD_RECHUNK: 'true' build-image: extends: - .build stage: build - # needs: - # - base-images + needs: + - base-images parallel: matrix: - RECIPE: diff --git a/recipes/base-cosmic-nvidia.yml b/recipes/base-cosmic-nvidia.yml index c8b34b8..85e5ec6 100644 --- a/recipes/base-cosmic-nvidia.yml +++ b/recipes/base-cosmic-nvidia.yml @@ -5,26 +5,5 @@ base-image: quay.io/fedora/fedora-bootc image-version: 42 description: The base image of Wunker OS modules: - # Latest build - - type: dnf - repos: - cleanup: true - copr: - - ryanabx/cosmic-epoch - install: - packages: - - cosmic-desktop - - # Official release - # - type: dnf - # group-install: - # packages: - # - cosmic-desktop-environment - - # Setup cosmic greeter as DM - - type: systemd - system: - enabled: - - cosmic-greeter - - from-file: common/nvidia.yml - - from-file: common/base-common.yml + - from-file: base/nvidia.yml + - from-file: base/common.yml diff --git a/recipes/base-cosmic.yml b/recipes/base-cosmic.yml index c87faab..e55b58c 100644 --- a/recipes/base-cosmic.yml +++ b/recipes/base-cosmic.yml @@ -1,28 +1,9 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json name: cosmic -base-image: ghcr.io/ublue-os/base-main +base-image: quay.io/fedora/fedora-bootc image-version: 42 description: The base image of Wunker OS modules: - - type: dnf - repos: - cleanup: true - copr: - - ryanabx/cosmic-epoch - install: - packages: - - cosmic-desktop - - # Official release - # - type: dnf - # group-install: - # packages: - # - cosmic-desktop-environment - - # Setup cosmic greeter as DM - - type: systemd - system: - enabled: - - cosmic-greeter - - from-file: common/base-common.yml + - from-file: base/cosmic.yml + - from-file: base/common.yml diff --git a/recipes/base-kinoite-nvidia.yml b/recipes/base-kinoite-nvidia.yml index 745532d..09c3bb0 100644 --- a/recipes/base-kinoite-nvidia.yml +++ b/recipes/base-kinoite-nvidia.yml @@ -1,18 +1,11 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json name: kinoite-nvidia -base-image: ghcr.io/ublue-os/kinoite-main +base-image: quay.io/fedora/fedora-bootc image-version: 42 description: The base image of Wunker OS modules: - - type: dnf - group-install: - packages: - - kde-desktop - - type: systemd - system: - enabled: - - sddm - - from-file: common/nvidia.yml - - from-file: common/base-common.yml + - from-file: base/kinoite.yml + - from-file: base/nvidia.yml + - from-file: base/common.yml diff --git a/recipes/base-kinoite.yml b/recipes/base-kinoite.yml index 7d077b6..9124a04 100644 --- a/recipes/base-kinoite.yml +++ b/recipes/base-kinoite.yml @@ -1,16 +1,9 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json name: kinoite -base-image: ghcr.io/ublue-os/kinoite-main +base-image: quay.io/fedora/fedora-bootc image-version: 42 description: The base image of Wunker OS modules: - - type: dnf - group-install: - packages: - - kde-desktop - - type: systemd - system: - enabled: - - sddm - - from-file: common/base-common.yml + - from-file: base/kinoite.yml + - from-file: base/common.yml diff --git a/recipes/common/base-common.yml b/recipes/base/common.yml similarity index 100% rename from recipes/common/base-common.yml rename to recipes/base/common.yml diff --git a/recipes/base/cosmic.yml b/recipes/base/cosmic.yml new file mode 100644 index 0000000..171fda3 --- /dev/null +++ b/recipes/base/cosmic.yml @@ -0,0 +1,22 @@ +modules: + # Latest build + - type: dnf + repos: + cleanup: true + copr: + - ryanabx/cosmic-epoch + install: + packages: + - cosmic-desktop + + # Official release + # - type: dnf + # group-install: + # packages: + # - cosmic-desktop-environment + + # Setup cosmic greeter as DM + - type: systemd + system: + enabled: + - cosmic-greeter diff --git a/recipes/base/kinoite.yml b/recipes/base/kinoite.yml new file mode 100644 index 0000000..22084a9 --- /dev/null +++ b/recipes/base/kinoite.yml @@ -0,0 +1,9 @@ +modules: + - type: dnf + group-install: + packages: + - kde-desktop + - type: systemd + system: + enabled: + - sddm diff --git a/recipes/common/nvidia.yml b/recipes/base/nvidia.yml similarity index 100% rename from recipes/common/nvidia.yml rename to recipes/base/nvidia.yml