Merge pull request #1670 from jodh-intel/update-github-labels

Update GitHub labels

cmd/github-labels/labels.yaml.in

@@ -55,6 +55,10 @@ categories:
       How the issue affect the operation of the system. A more precise version
       of regression.
 
+  - name: block
+    description: |
+      Stop a PR from being merged.
+
   - name: cleanup
     description: Refactoring, restructuring or general tidy-up needed.
 
@@ -241,6 +245,11 @@ labels:
     category: cleanup
     color: DEFAULT_COLOUR
 
+  - name: do-not-merge
+    description: PR has problems or depends on another
+    category: block
+    color: ff0000
+
   - name: duplicate
     description: Same issue as one already reported
     category: resolution
@@ -270,7 +279,6 @@ labels:
     description: Very urgent issue (resolve quickly)
     category: priority
     color: ff7f00
-    from: P2
 
   - name: high-severity
     description: Very important issue
@@ -281,7 +289,6 @@ labels:
     description: Critically urgent issue (must be resolved as soon as possible)
     category: priority
     color: ff0000
-    from: P1
 
   - name: highest-severity
     description: Extremely important issue
@@ -302,7 +309,6 @@ labels:
     description: Urgent issue (resolve before unprioritised issues)
     category: priority
     color: ffff00
-    from: P3
 
   - name: medium-severity
     description: Important issue
@@ -533,6 +539,11 @@ labels:
     category: behaviour
     color: DEFAULT_COLOUR
 
+  - name: wip
+    description: Work in Progress (PR incomplete - needs more work or rework)
+    category: block
+    color: ff0000
+
   - name: wont-fix
     description: Issue will not be fixed (not a good use of limited resources)
     category: resolution