Merge pull request #2343 from ublue-os/main

[pull] stable-f44 from main

Author: renner0e

.github/pull.yml

@@ -1,6 +1,18 @@
 version: "1"
 rules:
-  - base: main
-    upstream: ublue-os:main
-    mergeMethod: merge
+  - base: stable-f44
+    upstream: main
+    mergeMethod: hardreset
     mergeUnstable: false
+    reviewers:
+      - NiHaiden
+      - inffy
+      - ledif
+      - renner0e
+    conflictReviewers:
+      - NiHaiden
+      - inffy
+      - ledif
+      - renner0e
+label: "stable-promotion"
+conflictLabel: "promotion-conflict"

.github/workflows/build-image-latest-main.yml

@@ -8,6 +8,8 @@ on:
       - ".github/workflows/moderator.yml"
       - ".github/workflows/scorecard.yml"
   merge_group:
+    branches:
+      - stable-f44
   pull_request:
     branches:
       - stable-f44

Justfile

@@ -115,7 +115,7 @@ build $image="aurora" $tag="latest" $flavor="main" rechunk="0" ghcr="0" pipeline
     # AKMODS Flavor and Kernel Version
     if [[ "${tag}" =~ stable ]]; then
         akmods_flavor="coreos-stable"
-    elif [[ "${tag}" =~ beta ]]; then
+    elif [[ "${tag}" =~ testing ]]; then
         akmods_flavor="main"
     else
         akmods_flavor="main"

image-versions.yml

@@ -10,4 +10,4 @@ images:
   - name: brew
     image: ghcr.io/ublue-os/brew
     tag: latest
-    digest: sha256:985ed8b7d9dd6a93bde53328e257e9ecd8cb61eaf5780690622ef9e3aa39aba9
+    digest: sha256:fc3d3c27060e4bbbcb2e21a17a50c083b2588d404097ac86c97b1b2a75576db1