From eaca6a89ed0fb1f7a0e4c8c6d0e5b7ec44bb2d41 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com>
Date: Sun, 13 Jul 2025 01:04:21 -0400
Subject: [PATCH] Revert "See what caching with squash does"

This reverts commit 00495706e0f454b0b051aff30452550af0f7d549.
---
 .gitlab-ci.yml                      | 10 +++++-----
 recipes/jp-desktop-nvidia-bootc.yml | 18 +-----------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56238b6..d1f4a18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,11 +20,11 @@ build-image:
   parallel:
     matrix:
       - RECIPE:
-          # - cp-laptop.yml
+          - cp-laptop.yml
           - jp-desktop-nvidia.yml
-          # - jp-laptop.yml
-          # - wke-server.yml
-          # - wke-worker.yml
+          - jp-laptop.yml
+          - wke-server.yml
+          - wke-worker.yml
   variables:
     DOCKER_HOST: tcp://docker:2376
     DOCKER_TLS_CERTDIR: /certs
@@ -38,4 +38,4 @@ build-image:
     - export COSIGN_PRIVATE_KEY=$(cat .secure_files/cosign.key)
   script:
     - sleep 5
-    - bluebuild build -S sigstore -B podman --squash -p ./recipes/$RECIPE
+    - bluebuild build -S sigstore -p ./recipes/$RECIPE
diff --git a/recipes/jp-desktop-nvidia-bootc.yml b/recipes/jp-desktop-nvidia-bootc.yml
index 0d50dd2..ae24b86 100644
--- a/recipes/jp-desktop-nvidia-bootc.yml
+++ b/recipes/jp-desktop-nvidia-bootc.yml
@@ -2,29 +2,13 @@
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: jp-desktop-nvidia
 base-image: quay.io/fedora/fedora-kinoite
-image-version: 42
+image-version: 41
 description: The bootc image of Wunker OS for JP's desktop gaming.
 alt-tags:
   - bootc
 # stages:
   # - from-file: common/helix.yml
 modules:
-  - type: os-release
-    # source: local
-    source: ghcr.io/blue-build/modules/os-release:os-release
-    properties:
-      NAME: WunkerOS
-      ID: wunker_os
-      PRETTY_NAME: Wunker OS for Nvidia
-  - type: dnf
-    repos:
-      copr:
-        - ublue-os/akmods
-  - type: akmods
-    source: ghcr.io/franute/modules/akmods:nvidia-akmods
-    nvidia-driver: open
-    install:
-      - xone
   - from-file: common/jp-desktop.yml
   # - from-file: common/helix.yml
   - from-file: common/post-build.yml