[pull] stable-f44 from main

[pull]

See Commits and Changes for more details.

---

Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

[renner0e]

hmm, I wonder why the branch is outdated here

EDIT: make sense, it's a merge from main to stable

[inffy]

So what’s the correct method to merge here?

[renner0e]

So what’s the correct method to merge here?

probably merge (create a merge commit), we should probably change this (from hardreset) in the config file, not sure how much the changelogs are gonna like merge commits, we will see, and we likely don't want squash because of this, the changelogs would show one single promotion commit with a billion changes instead of many small ones.

We can experiment with multiple methods, this stable branch is gonna be a mess anyway (that's also why it's only being used for 6 months), due to cherry-picking and then merging changes from main into stable (which includes duplicate commits).

[renner0e]

not sure if the hardreset is the reason why the diff in github is kinda confusing, for example

git diff origin/stable-f44..origin/main

shows

diff --git a/.github/pull.yml b/.github/pull.yml
index 75cb8840..047cfe98 100644
--- a/.github/pull.yml
+++ b/.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"
diff --git a/.github/workflows/build-image-latest-main.yml b/.github/workflows/build-image-latest-main.yml
index f1fb4565..bf58b541 100644
--- a/.github/workflows/build-image-latest-main.yml
+++ b/.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
diff --git a/Justfile b/Justfile
index 5d87f185..4e315f6b 100644
--- a/Justfile
+++ b/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"
diff --git a/image-versions.yml b/image-versions.yml
index fdade33a..21ecdf92 100644
--- a/image-versions.yml
+++ b/image-versions.yml
@@ -10,4 +10,4 @@ images:
   - name: brew
     image: ghcr.io/ublue-os/brew
     tag: latest
-    digest: sha256:985ed8b7d9dd6a93bde53328e257e9ecd8cb61eaf5780690622ef9e3aa39aba9
+    digest: sha256:fc3d3c27060e4bbbcb2e21a17a50c083b2588d404097ac86c97b1b2a75576db1

[renner0e]

we can merge this for the sake of merging new things and trying stuff out, but there is nothing in here that we care about