From 83d841718b016585e1d488568326e658dfb2dae2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 25 Sep 2021 14:56:06 +0200
Subject: [PATCH] .github: improve the PR template

* switch from using checkboxes to deleting the lines which are not
applicable

* make it clear that filling out the part about manual builds is only
  necessary when the CI is skipped since this was easy to miss
---
 .github/pull_request_template.md | 33 +++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 1fdf9e94ea93..a254c8c6fb6b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,26 +1,29 @@
-<!-- Mark items with [x] where applicable -->
-
-#### General
-- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
+<!-- Uncomment relevant sections and delete the lines which are not applicable -->
+<!--
+## New package
+- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
+- This new package doesn't conform to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements), but I believe an exception should be made because xxx
+-->
 
-#### Have the results of the proposed changes been tested?
-- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
-- [ ] I generally don't use the affected packages but briefly tested this PR
+## Testing the changes
+- I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
+- I generally don't use the affected packages but briefly tested this PR
 
 <!--
 If GitHub CI cannot be used to validate the build result (for example, if the
 build is likely to take several hours), make sure to
 [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
-When skipping CI, uncomment and fill out the following section.
 Note: for builds that are likely to complete in less than 2 hours, it is not
 acceptable to skip CI.
+
+Ignore the following section if this PR doesn't skip CI.
 -->
 <!-- 
-#### Does it build and run successfully? 
-(Please choose at least one native build and, if supported, at least one cross build. More are better.)
-- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
-- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
-  - [ ] aarch64-musl
-  - [ ] armv7l
-  - [ ] armv6l-musl
+## Local build testing
+(Please test at least one native build and, if supported, at least one cross build. More are better.)
+- I built this PR locally for my native architecture, (ARCH-LIBC)
+- I built this PR locally for these architectures (if supported. mark crossbuilds):
+  - aarch64-musl
+  - armv7l
+  - armv6l-musl
 -->