From 1d230b36cf8b06c03e47089adf7694d39955012c Mon Sep 17 00:00:00 2001
From: Zhijie Yang <zhijie.yang@canonical.com>
Date: Mon, 9 Dec 2024 17:27:38 +0100
Subject: [PATCH 1/2] fix(ci): correct prepare-build release-to logic

---
 src/image/prepare_single_image_build_matrix.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/image/prepare_single_image_build_matrix.py b/src/image/prepare_single_image_build_matrix.py
index 52432701..39cc4f16 100755
--- a/src/image/prepare_single_image_build_matrix.py
+++ b/src/image/prepare_single_image_build_matrix.py
@@ -228,7 +228,10 @@ def main():
         # so let's remove this field since we don't need it for the builds
         del build["release"]
 
-    release_to = "true" if "release" in image_trigger else ""
+    release_to = "true" if any("release" in track for track in image_trigger["upload"]) else ""
+
+    print(image_trigger.keys())
+    print(image_trigger["upload"][0].keys())
 
     write_github_output(release_to, builds, args.revision_data_dir)
 

From 02e92fde9fa4004f644f29f8b71456064cb288bb Mon Sep 17 00:00:00 2001
From: zhijie-yang <zhijie-yang@localhost>
Date: Mon, 9 Dec 2024 16:39:23 +0000
Subject: [PATCH 2/2] ci: automatically update oci/mock-rock/_releases.json,
 from https://github.com/canonical/oci-factory/actions/runs/12239932505

---
 oci/mock-rock/_releases.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/oci/mock-rock/_releases.json b/oci/mock-rock/_releases.json
index 62d7445f..ce622464 100644
--- a/oci/mock-rock/_releases.json
+++ b/oci/mock-rock/_releases.json
@@ -35,31 +35,31 @@
     "1.1-22.04": {
         "end-of-life": "2030-05-01T00:00:00Z",
         "candidate": {
-            "target": "966"
+            "target": "969"
         },
         "beta": {
-            "target": "966"
+            "target": "969"
         },
         "edge": {
-            "target": "966"
+            "target": "969"
         }
     },
     "1-22.04": {
         "end-of-life": "2030-05-01T00:00:00Z",
         "candidate": {
-            "target": "966"
+            "target": "969"
         },
         "beta": {
-            "target": "966"
+            "target": "969"
         },
         "edge": {
-            "target": "966"
+            "target": "969"
         }
     },
     "1.2-22.04": {
         "end-of-life": "2030-05-01T00:00:00Z",
         "beta": {
-            "target": "967"
+            "target": "970"
         },
         "edge": {
             "target": "1.2-22.04_beta"