From a79e461ae31ab780a5a5acd54ea966ce1d6061b1 Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Wed, 21 Jun 2023 18:13:49 -0700
Subject: [PATCH 1/6] Updating emoji, and adding build issue

---
 .github/ISSUE_TEMPLATE/002-1.0-issue.yaml    |  2 +-
 .github/ISSUE_TEMPLATE/003-1.1-issue.yaml    |  2 +-
 .github/ISSUE_TEMPLATE/004-1.2-issue.yaml    |  2 +-
 .github/ISSUE_TEMPLATE/005-1.3-issue.yaml    |  2 +-
 .github/ISSUE_TEMPLATE/050-tooling-fix.yaml  |  2 +-
 .github/ISSUE_TEMPLATE/060-platform-fix.yaml |  2 +-
 .github/ISSUE_TEMPLATE/091-cert-blocker.yaml |  2 +-
 .github/ISSUE_TEMPLATE/098-build-issue.yaml  | 59 ++++++++++++++++++++
 8 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/098-build-issue.yaml

diff --git a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
index 78c0e9cf10a766..1e2b46dacbd03a 100644
--- a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F680 1.0 Issue"
+name: ":zero: 1.0 Issue"
 description: Create an issue that is required for Matter 1.0 release
 title: "[1.0] "
 labels: [bug, "V1.0", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml b/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
index cd6179d91fe6c7..4e1adc023880ca 100644
--- a/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F680 1.1 Issue"
+name: ":one: 1.1 Issue"
 description: Create an issue that is required for Matter 1.1 release
 title: "[1.1] "
 labels: [bug, "V1.1", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml b/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
index dd67cd7addbdea..8b644a8bcbc56d 100644
--- a/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F680 1.2 Issue"
+name: ":two: 1.2 Issue"
 description: Create an issue that is required for Matter 1.2 release
 title: "[1.2] "
 labels: [bug, "V1.2", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml b/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
index a904231a9e6020..d62b943937ae6d 100644
--- a/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F680 1.3 Issue"
+name: ":three: 1.3 Issue"
 description: Create an issue that is required for Matter 1.3 release
 title: "[1.3] "
 labels: [bug, "V1.3", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml b/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml
index 667c8946b2804e..0d775a61ef119d 100644
--- a/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml
+++ b/.github/ISSUE_TEMPLATE/050-tooling-fix.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F3C3 Tooling Fix/Feature"
+name: "\U0001F9F0 Tooling Fix/Feature"
 description: Create an issue for a tooling specific fix/feature
 title: "[Tooling] "
 labels: ["tools", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/060-platform-fix.yaml b/.github/ISSUE_TEMPLATE/060-platform-fix.yaml
index 691a5cedc6f604..fdb8b76d88f2ec 100644
--- a/.github/ISSUE_TEMPLATE/060-platform-fix.yaml
+++ b/.github/ISSUE_TEMPLATE/060-platform-fix.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F9F0 Platform Fix"
+name: "\U0001F3D7 Platform Fix"
 description: Create an issue for a platform specific fix
 title: "[Platform] "
 labels: ["platform", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml b/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
index bf24349cd393be..d0d6aa6f90b307 100644
--- a/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
+++ b/.github/ISSUE_TEMPLATE/091-cert-blocker.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F41B Cert Blocker"
+name: "\U0001F4DC Cert Blocker"
 description: Create a report to identify matter certification blockers
 title: "[CERT-BLOCKER] "
 labels: [bug, "cert blocker", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/098-build-issue.yaml b/.github/ISSUE_TEMPLATE/098-build-issue.yaml
new file mode 100644
index 00000000000000..c1f6295bc9d9c5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/098-build-issue.yaml
@@ -0,0 +1,59 @@
+name: "\U0001F6E0 Build Issue"
+description: Build issue
+title: "[Build] "
+labels: ["build issue", "needs triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting an issue against the Matter SDK's builds! We need information about the bug report to follow up, so please help us out by filling out this information.
+  - type: textarea
+    id: repro
+    attributes:
+      label: Build issues
+      description: "What are the build issues? Please include links to failed jobs if possible."
+      value: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Platform
+      description: What platforms are affected?
+      multiple: true
+      options:
+        - ameba
+        - android
+        - cc13x2_cc26x2
+        - darwin
+        - efr32
+        - esp32
+        - freeRTOS
+        - IMX8
+        - k32w
+        - nrf connect
+        - nrf
+        - python
+        - raspi
+        - vscode
+        - windows
+        - other
+        - core (please add to version below)
+        - all
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: "Thanks for helping improve our builds"

From 0e0d1b1a51c7f9e507f5ac2d6078155c3207f686 Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Wed, 21 Jun 2023 18:18:40 -0700
Subject: [PATCH 2/6] Trying this unicode

---
 .github/ISSUE_TEMPLATE/002-1.0-issue.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
index 1e2b46dacbd03a..c0360ffcb5823e 100644
--- a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
@@ -1,4 +1,4 @@
-name: ":zero: 1.0 Issue"
+name: "\U00000031 1.0 Issue"
 description: Create an issue that is required for Matter 1.0 release
 title: "[1.0] "
 labels: [bug, "V1.0", "needs triage"]

From 79a4d6580083df7f69d8928f4fa09b35b997201b Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Wed, 21 Jun 2023 18:19:48 -0700
Subject: [PATCH 3/6] Trying again

---
 .github/ISSUE_TEMPLATE/002-1.0-issue.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
index c0360ffcb5823e..e3c51cab7559e6 100644
--- a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
@@ -1,4 +1,4 @@
-name: "\U00000031 1.0 Issue"
+name: "\U0001F031 1.0 Issue"
 description: Create an issue that is required for Matter 1.0 release
 title: "[1.0] "
 labels: [bug, "V1.0", "needs triage"]

From 78c9353299762392e533e1ba8b0f55bafce0a70a Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Wed, 21 Jun 2023 18:21:16 -0700
Subject: [PATCH 4/6] Next

---
 .github/ISSUE_TEMPLATE/002-1.0-issue.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
index e3c51cab7559e6..5eb7fbf24ebeaf 100644
--- a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
@@ -1,4 +1,4 @@
-name: "\U0001F031 1.0 Issue"
+name: "\u0031\u20e3 1.0 Issue"
 description: Create an issue that is required for Matter 1.0 release
 title: "[1.0] "
 labels: [bug, "V1.0", "needs triage"]

From eba61f8737c12b20820dc5be906378f551b2fbb6 Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Wed, 21 Jun 2023 18:21:57 -0700
Subject: [PATCH 5/6] Found it

---
 .github/ISSUE_TEMPLATE/002-1.0-issue.yaml | 2 +-
 .github/ISSUE_TEMPLATE/003-1.1-issue.yaml | 2 +-
 .github/ISSUE_TEMPLATE/004-1.2-issue.yaml | 2 +-
 .github/ISSUE_TEMPLATE/005-1.3-issue.yaml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
index 5eb7fbf24ebeaf..10551fef60fe44 100644
--- a/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/002-1.0-issue.yaml
@@ -1,4 +1,4 @@
-name: "\u0031\u20e3 1.0 Issue"
+name: "\u0030\u20e3 1.0 Issue"
 description: Create an issue that is required for Matter 1.0 release
 title: "[1.0] "
 labels: [bug, "V1.0", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml b/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
index 4e1adc023880ca..50db3e80a95c33 100644
--- a/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/003-1.1-issue.yaml
@@ -1,4 +1,4 @@
-name: ":one: 1.1 Issue"
+name: "\u0031\u20e3 1.1 Issue"
 description: Create an issue that is required for Matter 1.1 release
 title: "[1.1] "
 labels: [bug, "V1.1", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml b/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
index 8b644a8bcbc56d..81b641a52e45ef 100644
--- a/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/004-1.2-issue.yaml
@@ -1,4 +1,4 @@
-name: ":two: 1.2 Issue"
+name: "\u0032\u20e3 1.2 Issue"
 description: Create an issue that is required for Matter 1.2 release
 title: "[1.2] "
 labels: [bug, "V1.2", "needs triage"]
diff --git a/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml b/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
index d62b943937ae6d..5c91f91e75b3be 100644
--- a/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/005-1.3-issue.yaml
@@ -1,4 +1,4 @@
-name: ":three: 1.3 Issue"
+name: "\u0033\u20e3 1.3 Issue"
 description: Create an issue that is required for Matter 1.3 release
 title: "[1.3] "
 labels: [bug, "V1.3", "needs triage"]

From 29ea7d0f6650f1f10fbddebd40795b38a2c2b06d Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Wed, 21 Jun 2023 18:22:54 -0700
Subject: [PATCH 6/6] Title fix

---
 .github/ISSUE_TEMPLATE/098-build-issue.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/098-build-issue.yaml b/.github/ISSUE_TEMPLATE/098-build-issue.yaml
index c1f6295bc9d9c5..5d1adb35548657 100644
--- a/.github/ISSUE_TEMPLATE/098-build-issue.yaml
+++ b/.github/ISSUE_TEMPLATE/098-build-issue.yaml
@@ -10,7 +10,7 @@ body:
   - type: textarea
     id: repro
     attributes:
-      label: Build issues
+      label: Build issue(s)
       description: "What are the build issues? Please include links to failed jobs if possible."
       value: |
         1.