From 855d0843a1219afe4d4073f1ca491094d7cae274 Mon Sep 17 00:00:00 2001
From: Spookerton <918997+Spookerton@users.noreply.github.com>
Date: Thu, 26 Oct 2023 16:35:32 +0300
Subject: [PATCH 1/3] [MIRROR] fixed generate_cl yaml loading

---
 tools/changelog/generate_cl.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/changelog/generate_cl.py b/tools/changelog/generate_cl.py
index 8d84218312374..ca33182b66dda 100644
--- a/tools/changelog/generate_cl.py
+++ b/tools/changelog/generate_cl.py
@@ -70,8 +70,9 @@
 
 write_cl['delete-after'] = True
 
+yaml = yaml.YAML(type='safe',pure=True)
 with open(Path.cwd().joinpath("tools/changelog/tags.yml")) as file:
-    tags = yaml.safe_load(file)
+    tags = yaml.load(file)
 
 write_cl['changes'] = []
 
@@ -83,7 +84,6 @@
 
 if write_cl['changes']:
     with io.StringIO() as cl_contents:
-        yaml = yaml.YAML()
         yaml.indent(sequence=4, offset=2)
         yaml.dump(write_cl, cl_contents)
         cl_contents.seek(0)
@@ -93,4 +93,8 @@
     print("Done!")
 else:
     print("No CL changes detected!")
+<<<<<<< ours
     exit(1) # Change to a '1' if you want the action to count lacking CL changes as a failure
+=======
+    exit(0) # Change to a '1' if you want the action to count lacking CL changes as a failure
+>>>>>>> theirs

From d593685c4f73c983fbe02e10805b1772d3b64a5e Mon Sep 17 00:00:00 2001
From: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
Date: Thu, 26 Oct 2023 16:49:39 +0300
Subject: [PATCH 2/3] Update generate_cl.py

---
 tools/changelog/generate_cl.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tools/changelog/generate_cl.py b/tools/changelog/generate_cl.py
index ca33182b66dda..4fde5a3543ae8 100644
--- a/tools/changelog/generate_cl.py
+++ b/tools/changelog/generate_cl.py
@@ -93,8 +93,4 @@
     print("Done!")
 else:
     print("No CL changes detected!")
-<<<<<<< ours
     exit(1) # Change to a '1' if you want the action to count lacking CL changes as a failure
-=======
-    exit(0) # Change to a '1' if you want the action to count lacking CL changes as a failure
->>>>>>> theirs

From 7a2be61ad68817b0e11d99d7746ee4101ebe2c46 Mon Sep 17 00:00:00 2001
From: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
Date: Thu, 26 Oct 2023 16:53:29 +0300
Subject: [PATCH 3/3] Fix check changelog

---
 tools/changelog/sierra_check_changelog.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/changelog/sierra_check_changelog.py b/tools/changelog/sierra_check_changelog.py
index 05e8a1dd7d9e2..3a321f065d74c 100644
--- a/tools/changelog/sierra_check_changelog.py
+++ b/tools/changelog/sierra_check_changelog.py
@@ -73,8 +73,9 @@
 if not write_cl['author']:
     print("There are spaces or tabs instead of author username")
 
+yaml = yaml.YAML(type='safe',pure=True)
 with open(Path.cwd().joinpath("tags.yml")) as file:
-    tags = yaml.safe_load(file)
+    tags = yaml.load(file)
 
 write_cl['changes'] = []