From 5bb9f564c6a3d5e15794c53969793845a2c97ca4 Mon Sep 17 00:00:00 2001
From: Joe Rickerby <joerick@mac.com>
Date: Fri, 10 Sep 2021 15:30:39 +0100
Subject: [PATCH 1/4] Create a bug report issue template

---
 .github/ISSUE_TEMPLATE/bug_report.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..a66a9534
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- 
+Hi! If you're not sure whether your problem is a bug in cibuildwheel or something else, please consider asking a question in the Discussions tab first!
+-->
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Build log**
+<!-- Please provide a link to a build log that shows the problem -->
+
+**CI config**
+<!-- Link to the CI config that produced the build log above. e.g. the Github Actions workflow file -->
+
+**Additional context**
+Add any other context about the problem here.

From f07b8ca34eb74d005ac62884489544338d1fbdc0 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 14:31:56 +0000
Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index a66a9534..2a377a8a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-<!-- 
+<!--
 Hi! If you're not sure whether your problem is a bug in cibuildwheel or something else, please consider asking a question in the Discussions tab first!
 -->
 

From 1a9db877416d0d96d1e6bd6ec6daf52a67552273 Mon Sep 17 00:00:00 2001
From: Joe Rickerby <joerick@mac.com>
Date: Fri, 10 Sep 2021 15:34:24 +0100
Subject: [PATCH 3/4] More commenty style...

---
 .github/ISSUE_TEMPLATE/bug_report.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 2a377a8a..42ba1ba9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -12,7 +12,7 @@ Hi! If you're not sure whether your problem is a bug in cibuildwheel or somethin
 -->
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 
 **Build log**
 <!-- Please provide a link to a build log that shows the problem -->
@@ -21,4 +21,4 @@ A clear and concise description of what the bug is.
 <!-- Link to the CI config that produced the build log above. e.g. the Github Actions workflow file -->
 
 **Additional context**
-Add any other context about the problem here.
+<!-- Add any other context about the problem here. -->

From 7ddd1f9cb2c7536fb618cc5da7b2556d540a75d2 Mon Sep 17 00:00:00 2001
From: Joe Rickerby <joerick@mac.com>
Date: Mon, 20 Sep 2021 09:16:11 +0100
Subject: [PATCH 4/4] Try issue forms

---
 .github/ISSUE_TEMPLATE/bug_report.md  | 24 ---------------------
 .github/ISSUE_TEMPLATE/bug_report.yml | 31 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 24 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 42ba1ba9..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!--
-Hi! If you're not sure whether your problem is a bug in cibuildwheel or something else, please consider asking a question in the Discussions tab first!
--->
-
-**Describe the bug**
-<!-- A clear and concise description of what the bug is. -->
-
-**Build log**
-<!-- Please provide a link to a build log that shows the problem -->
-
-**CI config**
-<!-- Link to the CI config that produced the build log above. e.g. the Github Actions workflow file -->
-
-**Additional context**
-<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000..11784a1b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,31 @@
+name: General issue
+description: Open a general issue
+
+body:
+- type: markdown
+  attributes:
+    value: |
+      Hi! If you're not sure whether your problem is a bug in cibuildwheel or something else, please consider asking a question in the Discussions tab first.
+
+- type: textarea
+  id: description
+  attributes:
+    label: Description
+
+- type: input
+  id: log
+  attributes:
+    label: Build log
+    description: If relevant, please provide a link to a build log that shows the problem
+    placeholder: https://...
+  validations:
+    required: false
+
+- type: input
+  id: ci-config
+  attributes:
+    label: CI config
+    description: Link to the CI config that produced the build log above. e.g. the Github Actions workflow file
+    placeholder: https://...
+  validations:
+    required: false