From 828f8ef2cf997205c748596c0dca2fa6e2f4889f Mon Sep 17 00:00:00 2001
From: qoijjj <129108030+qoijjj@users.noreply.github.com>
Date: Tue, 18 Jun 2024 13:35:03 -0700
Subject: [PATCH] fix: build fixes resulting from upstream breakage

---
 .github/workflows/build.yml                               | 6 +++---
 recipes/general/recipe-cinnamon-main-userns.yml           | 2 +-
 recipes/general/recipe-cinnamon-main.yml                  | 2 +-
 recipes/general/recipe-cinnamon-nvidia-userns.yml         | 2 +-
 recipes/general/recipe-cinnamon-nvidia.yml                | 2 +-
 recipes/general/recipe-wayblue-hyprland-main-userns.yml   | 2 +-
 recipes/general/recipe-wayblue-hyprland-main.yml          | 2 +-
 recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml | 2 +-
 recipes/general/recipe-wayblue-hyprland-nvidia.yml        | 2 +-
 recipes/general/recipe-wayblue-river-main-userns.yml      | 2 +-
 recipes/general/recipe-wayblue-river-main.yml             | 2 +-
 recipes/general/recipe-wayblue-river-nvidia-userns.yml    | 2 +-
 recipes/general/recipe-wayblue-river-nvidia.yml           | 2 +-
 recipes/general/recipe-wayblue-sway-main-userns.yml       | 2 +-
 recipes/general/recipe-wayblue-sway-main.yml              | 2 +-
 recipes/general/recipe-wayblue-sway-nvidia-userns.yml     | 2 +-
 recipes/general/recipe-wayblue-sway-nvidia.yml            | 2 +-
 recipes/general/recipe-wayblue-wayfire-main-userns.yml    | 2 +-
 recipes/general/recipe-wayblue-wayfire-main.yml           | 2 +-
 recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml  | 2 +-
 recipes/general/recipe-wayblue-wayfire-nvidia.yml         | 2 +-
 21 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af3dd6b..da43253 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -117,13 +117,13 @@ jobs:
         if: ${{ !contains(env.IMAGE_NAME, 'wayblue') && !contains(env.IMAGE_NAME, 'cinnamon') }}
         uses: EyeCantCU/cosign-action/verify@v0.2.2
         with:
-          containers: ${{ env.BASE_IMAGE_NAME }}:40
+          containers: ${{ env.BASE_IMAGE_NAME }}:latest
 
       - name: Verify base image
         if: ${{ contains(env.IMAGE_NAME, 'wayblue') }}
         uses: EyeCantCU/cosign-action/verify@v0.2.2
         with:
-          containers: ${{ env.BASE_IMAGE_NAME }}:40
+          containers: ${{ env.BASE_IMAGE_NAME }}:latest
           registry: 'ghcr.io/wayblueorg'
           pubkey: 'https://raw.githubusercontent.com/wayblueorg/wayblue/live/cosign.pub'
 
@@ -131,7 +131,7 @@ jobs:
         if: ${{ contains(env.IMAGE_NAME, 'cinnamon') }}
         uses: EyeCantCU/cosign-action/verify@v0.2.2
         with:
-          containers: ${{ env.BASE_IMAGE_NAME }}:40
+          containers: ${{ env.BASE_IMAGE_NAME }}:latest
           registry: 'ghcr.io/legacy-images'
           pubkey: 'https://raw.githubusercontent.com/legacy-images/cinnamon/main/cosign.pub'
 
diff --git a/recipes/general/recipe-cinnamon-main-userns.yml b/recipes/general/recipe-cinnamon-main-userns.yml
index 2db11fd..35d32cc 100644
--- a/recipes/general/recipe-cinnamon-main-userns.yml
+++ b/recipes/general/recipe-cinnamon-main-userns.yml
@@ -5,7 +5,7 @@ description: "Cinnamon main with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/legacy-images/cinnamon-main
-image-version: 40-20240616
+image-version: 40-20240614
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-cinnamon-main.yml b/recipes/general/recipe-cinnamon-main.yml
index e84ef4b..458bfb4 100644
--- a/recipes/general/recipe-cinnamon-main.yml
+++ b/recipes/general/recipe-cinnamon-main.yml
@@ -5,7 +5,7 @@ description: "Cinnamon main with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/legacy-images/cinnamon-main
-image-version: 40-20240616
+image-version: 40-20240614
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-cinnamon-nvidia-userns.yml b/recipes/general/recipe-cinnamon-nvidia-userns.yml
index 01b3248..af65702 100644
--- a/recipes/general/recipe-cinnamon-nvidia-userns.yml
+++ b/recipes/general/recipe-cinnamon-nvidia-userns.yml
@@ -5,7 +5,7 @@ description: "Cinnamon nvidia with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/legacy-images/cinnamon-nvidia
-image-version: 40-20240616
+image-version: 40-20240614
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-cinnamon-nvidia.yml b/recipes/general/recipe-cinnamon-nvidia.yml
index 38b3939..c69a8a4 100644
--- a/recipes/general/recipe-cinnamon-nvidia.yml
+++ b/recipes/general/recipe-cinnamon-nvidia.yml
@@ -5,7 +5,7 @@ description: "Cinnamon nvidia with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/legacy-images/cinnamon-nvidia
-image-version: 40-20240616
+image-version: 40-20240614
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-hyprland-main-userns.yml b/recipes/general/recipe-wayblue-hyprland-main-userns.yml
index 14ec189..7444b6d 100644
--- a/recipes/general/recipe-wayblue-hyprland-main-userns.yml
+++ b/recipes/general/recipe-wayblue-hyprland-main-userns.yml
@@ -5,7 +5,7 @@ description: "wayblue hyprland main with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/hyprland
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-hyprland-main.yml b/recipes/general/recipe-wayblue-hyprland-main.yml
index 880229d..1d11ea8 100644
--- a/recipes/general/recipe-wayblue-hyprland-main.yml
+++ b/recipes/general/recipe-wayblue-hyprland-main.yml
@@ -5,7 +5,7 @@ description: "wayblue hyprland main with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/hyprland
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml b/recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml
index b5fc592..d1c6b99 100644
--- a/recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml
+++ b/recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml
@@ -5,7 +5,7 @@ description: "wayblue hyprland nvidia with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/hyprland-nvidia
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-hyprland-nvidia.yml b/recipes/general/recipe-wayblue-hyprland-nvidia.yml
index b26338e..4c868d5 100644
--- a/recipes/general/recipe-wayblue-hyprland-nvidia.yml
+++ b/recipes/general/recipe-wayblue-hyprland-nvidia.yml
@@ -5,7 +5,7 @@ description: "wayblue hyprland nvidia with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/hyprland-nvidia
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-river-main-userns.yml b/recipes/general/recipe-wayblue-river-main-userns.yml
index e6b7bd2..87c2c3f 100644
--- a/recipes/general/recipe-wayblue-river-main-userns.yml
+++ b/recipes/general/recipe-wayblue-river-main-userns.yml
@@ -5,7 +5,7 @@ description: "wayblue river main with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/river
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-river-main.yml b/recipes/general/recipe-wayblue-river-main.yml
index e06ddf4..6bf63cc 100644
--- a/recipes/general/recipe-wayblue-river-main.yml
+++ b/recipes/general/recipe-wayblue-river-main.yml
@@ -5,7 +5,7 @@ description: "wayblue river main with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/river
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-river-nvidia-userns.yml b/recipes/general/recipe-wayblue-river-nvidia-userns.yml
index 27ab8b7..70f869d 100644
--- a/recipes/general/recipe-wayblue-river-nvidia-userns.yml
+++ b/recipes/general/recipe-wayblue-river-nvidia-userns.yml
@@ -5,7 +5,7 @@ description: "wayblue river nvidia with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/river-nvidia
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-river-nvidia.yml b/recipes/general/recipe-wayblue-river-nvidia.yml
index e665dba..f5ed88f 100644
--- a/recipes/general/recipe-wayblue-river-nvidia.yml
+++ b/recipes/general/recipe-wayblue-river-nvidia.yml
@@ -5,7 +5,7 @@ description: "wayblue river nvidia with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/river-nvidia
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-sway-main-userns.yml b/recipes/general/recipe-wayblue-sway-main-userns.yml
index f29ac6b..6806706 100644
--- a/recipes/general/recipe-wayblue-sway-main-userns.yml
+++ b/recipes/general/recipe-wayblue-sway-main-userns.yml
@@ -5,7 +5,7 @@ description: "wayblue sway main with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/sway
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-sway-main.yml b/recipes/general/recipe-wayblue-sway-main.yml
index 1b5e02c..f4d99f2 100644
--- a/recipes/general/recipe-wayblue-sway-main.yml
+++ b/recipes/general/recipe-wayblue-sway-main.yml
@@ -5,7 +5,7 @@ description: "wayblue sway main with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/sway
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-sway-nvidia-userns.yml b/recipes/general/recipe-wayblue-sway-nvidia-userns.yml
index c818e8f..1295fba 100644
--- a/recipes/general/recipe-wayblue-sway-nvidia-userns.yml
+++ b/recipes/general/recipe-wayblue-sway-nvidia-userns.yml
@@ -5,7 +5,7 @@ description: "wayblue sway nvidia with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/sway-nvidia
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-sway-nvidia.yml b/recipes/general/recipe-wayblue-sway-nvidia.yml
index cfdb3b8..11ea98c 100644
--- a/recipes/general/recipe-wayblue-sway-nvidia.yml
+++ b/recipes/general/recipe-wayblue-sway-nvidia.yml
@@ -5,7 +5,7 @@ description: "wayblue sway nvidia with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/sway-nvidia
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-wayfire-main-userns.yml b/recipes/general/recipe-wayblue-wayfire-main-userns.yml
index dc5c52c..96cdaa7 100644
--- a/recipes/general/recipe-wayblue-wayfire-main-userns.yml
+++ b/recipes/general/recipe-wayblue-wayfire-main-userns.yml
@@ -5,7 +5,7 @@ description: "wayblue wayfire main with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/wayfire
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-wayfire-main.yml b/recipes/general/recipe-wayblue-wayfire-main.yml
index 5026dff..68adaea 100644
--- a/recipes/general/recipe-wayblue-wayfire-main.yml
+++ b/recipes/general/recipe-wayblue-wayfire-main.yml
@@ -5,7 +5,7 @@ description: "wayblue wayfire main with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/wayfire
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml b/recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml
index 68e2feb..506109f 100644
--- a/recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml
+++ b/recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml
@@ -5,7 +5,7 @@ description: "wayblue wayfire nvidia with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/wayfire-nvidia
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module
diff --git a/recipes/general/recipe-wayblue-wayfire-nvidia.yml b/recipes/general/recipe-wayblue-wayfire-nvidia.yml
index a24a309..7889c6c 100644
--- a/recipes/general/recipe-wayblue-wayfire-nvidia.yml
+++ b/recipes/general/recipe-wayblue-wayfire-nvidia.yml
@@ -5,7 +5,7 @@ description: "wayblue wayfire nvidia with some hardening applied"
 
 # the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/wayblueorg/wayfire-nvidia
-image-version: 40-20240616
+image-version: latest
 
 # list of modules, executed in order
 # you can include multiple instances of the same module