From 8a85e2e17858103101457352498e5038859cd4c6 Mon Sep 17 00:00:00 2001
From: Igor G <igor.gutchin@gmail.com>
Date: Sun, 11 Aug 2024 20:57:13 -0400
Subject: [PATCH] final?

---
 .github/workflows/build.yml        | 42 ++++++++++++++++--------------
 recipes/recipe-hyprland-nvidia.yml | 10 +++----
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47a676a..6901704 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,16 +1,18 @@
-name: build-wayblue
+name: HyprBlue-builder
 on:
   schedule:
-    - cron: "00 4 * * *" # build at 4:00 UTC every day 
-                          # (20 minutes after last ublue images start building)
+    - cron: "00 18 * * *" # build at 18:00 UTC every day 
+                          # 80 minutes after the last uBlue images start building
+                          # 60 minutes after last wayblue images start building
   push:
     paths-ignore: # don't rebuild if only documentation has changed
       - "**.md"
       
+  pull_request:
   workflow_dispatch: # allow manually triggering builds
 jobs:
   bluebuild:
-    name: Build wayblue
+    name: Build HyprBlue
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -21,27 +23,27 @@ jobs:
       matrix:
         recipe:
           - recipe-hyprland.yml
-          - #recipe-hyprland-nvidia.yml
+          - recipe-hyprland-nvidia.yml
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
+    #  - name: Checkout repo
+    #    uses: actions/checkout@v4
 
-      - name: Add yq (for reading recipe.yml)
-        uses: mikefarah/yq@v4.44.2
+    #  - name: Add yq (for reading recipe.yml)
+    #    uses: mikefarah/yq@v4.44.2
 
-      - name: Gather image data from recipe
-        run: |
-          echo "IMAGE_NAME=$(yq '.name' ./recipes/${{ matrix.recipe }})" >> $GITHUB_ENV
-          echo "IMAGE_MAJOR_VERSION=$(yq '.image-version' ./recipes/${{ matrix.recipe }})" >> $GITHUB_ENV
-          BASE_IMAGE=$(yq '.base-image' ./recipes/${{ matrix.recipe }})
-          echo "BASE_IMAGE_NAME=$(echo $BASE_IMAGE | sed 's/.*\/.*\///')" >> $GITHUB_ENV
+    #  - name: Gather image data from recipe
+    #    run: |
+    #      echo "IMAGE_NAME=$(yq '.name' ./recipes/${{ matrix.recipe }})" >> $GITHUB_ENV
+    #      echo "IMAGE_MAJOR_VERSION=$(yq '.image-version' ./recipes/${{ matrix.recipe }})" >> $GITHUB_ENV
+    #      BASE_IMAGE=$(yq '.base-image' ./recipes/${{ matrix.recipe }})
+    #      echo "BASE_IMAGE_NAME=$(echo $BASE_IMAGE | sed 's/.*\/.*\///')" >> $GITHUB_ENV
 
-      - name: Verify base image
-        uses: EyeCantCU/cosign-action/verify@v0.3.0
-        with:
-          containers: ${{ env.BASE_IMAGE_NAME }}:${{ env.IMAGE_MAJOR_VERSION }}
+    #  - name: Verify base image
+    #    uses: EyeCantCU/cosign-action/verify@v0.3.0
+    #    with:
+    #      containers: ${{ env.BASE_IMAGE_NAME }}:${{ env.IMAGE_MAJOR_VERSION }}
 
-      - name: Build wayblue
+      - name: Build HyprBlue
         uses: blue-build/github-action@v1.6.1
         with:
           cli_version: v0.8.11
diff --git a/recipes/recipe-hyprland-nvidia.yml b/recipes/recipe-hyprland-nvidia.yml
index d30415b..f783ab3 100644
--- a/recipes/recipe-hyprland-nvidia.yml
+++ b/recipes/recipe-hyprland-nvidia.yml
@@ -1,11 +1,11 @@
-name: hyprland-nvidia
+name: hyprland
 
 description: ublue images for wayland compositors
 
-#base-image: ghcr.io/ublue-os/base-nvidia
+#base-image: ghcr.io/ublue-os/base-main
 base-image: ghcr.io/ublue-os/bazzite-nvidia
 
-image-version: 40
+image-version: 40 
 
 modules:
   - from-file: sddm-packages.yml
@@ -14,9 +14,7 @@ modules:
   - from-file: hyprland-files.yml
   - from-file: common-files.yml
   - from-file: common-scripts.yml
-  - from-file: hyprland-scripts.yml  
+  - from-file: hyprland-scripts.yml   
   - from-file: sddm-scripts.yml
   - type: wayblue-signing
-  - #type: signing # this sets up the proper policy & signing files for signed images to work fully
   - from-file: sddm-systemd.yml
-