From 40e9746f7207dc93babc0662e73af833ead58df2 Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Fri, 12 Sep 2025 11:54:54 -0400 Subject: [PATCH] Update os-release and build all base images --- .gitlab-ci.yml | 22 +++++++++++++++++----- recipes/base-combo-nvidia.yml | 4 ++++ recipes/base-combo.yml | 4 ++++ recipes/base-cosmic-nvidia.yml | 4 ++++ recipes/base-cosmic.yml | 4 ++++ recipes/base-kinoite-nvidia.yml | 4 ++++ recipes/base-kinoite.yml | 4 ++++ recipes/cp-laptop.yml | 1 - 8 files changed, 41 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d280120..7501162 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,18 +39,30 @@ base-images: extends: - .build stage: base-images + rules: + # Run when any of the base recipes change + - changes: + - recipes/base*.yml + - recipes/base/* + - .gitlab-ci.yml + when: always + # Run on a scheduled pipeline (weekly or otherwise) + - if: $CI_PIPELINE_SOURCE == "schedule" + when: always + # All other cases: do not run + - when: never parallel: matrix: - RECIPE: - # - base-cosmic.yml - # - base-cosmic-nvidia.yml + - base-cosmic.yml + - base-cosmic-nvidia.yml - base-combo.yml - base-combo-nvidia.yml - # - base-kinoite.yml - # - base-kinoite-nvidia.yml + - base-kinoite.yml + - base-kinoite-nvidia.yml TAG: 519-device-or-resource-busy-when-trying-to-rechunk-the-image-in-gitlab-ci BB_BUILD_PUSH: 'true' - # BB_BUILD_RECHUNK: 'true' + BB_BUILD_RECHUNK: 'true' legacy-build-images: extends: diff --git a/recipes/base-combo-nvidia.yml b/recipes/base-combo-nvidia.yml index a8482ff..fd83735 100644 --- a/recipes/base-combo-nvidia.yml +++ b/recipes/base-combo-nvidia.yml @@ -9,4 +9,8 @@ modules: - from-file: base/cosmic.yml - from-file: base/kinoite.yml - from-file: base/nvidia.yml + - type: os-release + properties: + NAME: WunkerOS + PRETTY_NAME: Wunker OS - COSMIC X Kinoite for Nvidia - from-file: base/post-build.yml diff --git a/recipes/base-combo.yml b/recipes/base-combo.yml index d771c26..8c2cc2a 100644 --- a/recipes/base-combo.yml +++ b/recipes/base-combo.yml @@ -8,4 +8,8 @@ modules: - from-file: base/common.yml - from-file: base/cosmic.yml - from-file: base/kinoite.yml + - type: os-release + properties: + NAME: WunkerOS + PRETTY_NAME: Wunker OS - COSMIC X Kinoite - from-file: base/post-build.yml diff --git a/recipes/base-cosmic-nvidia.yml b/recipes/base-cosmic-nvidia.yml index 144787b..ae548bf 100644 --- a/recipes/base-cosmic-nvidia.yml +++ b/recipes/base-cosmic-nvidia.yml @@ -9,4 +9,8 @@ modules: - from-file: base/cosmic.yml - from-file: base/cosmic-greeter.yml - from-file: base/nvidia.yml + - type: os-release + properties: + NAME: WunkerOS + PRETTY_NAME: Wunker OS - COSMIC Atomic for Nvidia - from-file: base/post-build.yml diff --git a/recipes/base-cosmic.yml b/recipes/base-cosmic.yml index 0ffa9e2..fc3cd98 100644 --- a/recipes/base-cosmic.yml +++ b/recipes/base-cosmic.yml @@ -8,4 +8,8 @@ modules: - from-file: base/common.yml - from-file: base/cosmic.yml - from-file: base/cosmic-greeter.yml + - type: os-release + properties: + NAME: WunkerOS + PRETTY_NAME: Wunker OS - COSMIC Atomic - from-file: base/post-build.yml diff --git a/recipes/base-kinoite-nvidia.yml b/recipes/base-kinoite-nvidia.yml index 2c7e605..069d9e0 100644 --- a/recipes/base-kinoite-nvidia.yml +++ b/recipes/base-kinoite-nvidia.yml @@ -8,4 +8,8 @@ modules: - from-file: base/common.yml - from-file: base/kinoite.yml - from-file: base/nvidia.yml + - type: os-release + properties: + NAME: WunkerOS + PRETTY_NAME: Wunker OS - Kinoite for Nvidia - from-file: base/post-build.yml diff --git a/recipes/base-kinoite.yml b/recipes/base-kinoite.yml index 0d67cd5..d42ed65 100644 --- a/recipes/base-kinoite.yml +++ b/recipes/base-kinoite.yml @@ -7,4 +7,8 @@ description: The base image of Wunker OS with Plasma modules: - from-file: base/common.yml - from-file: base/kinoite.yml + - type: os-release + properties: + NAME: WunkerOS + PRETTY_NAME: Wunker OS - Kinoite - from-file: base/post-build.yml diff --git a/recipes/cp-laptop.yml b/recipes/cp-laptop.yml index 59d1110..51d8888 100644 --- a/recipes/cp-laptop.yml +++ b/recipes/cp-laptop.yml @@ -8,7 +8,6 @@ modules: - type: os-release properties: NAME: WunkerOS - ID: wunker_os PRETTY_NAME: Wunker OS for Framework 13 - type: dnf # repos: