Skip to content

Commit 149a9ef

Browse files
authored
Improve automerge error message for breaking changes (#596)
* Improve automerge error message for breaking changes * shorten message * bump version * update reference tests
1 parent bb4aae0 commit 149a9ef

File tree

19 files changed

+85
-18
lines changed

19 files changed

+85
-18
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "RegistryCI"
22
uuid = "0c95cc5f-2f7e-43fe-82dd-79dbcba86b32"
33
authors = ["Dilum Aluthge <dilum@aluthge.com>", "Fredrik Ekre <ekrefredrik@gmail.com>", "contributors"]
4-
version = "10.10.3"
4+
version = "10.10.4"
55

66
[deps]
77
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/AutoMerge/guidelines.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,13 @@ function breaking_explanation_message(has_release_notes)
353353
```
354354
355355
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
356+
357+
Either way, you need to mention the words \"breaking\" or \"changelog\", even if it is just to say "there are no breaking changes", or "see the changelog".
356358
</details>
357359
"""
358360
if has_release_notes
359361
return """
360-
This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
362+
This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words \"breaking\" or \"changelog\").
361363
$(example_detail)
362364
"""
363365
else

test/automerge-unit.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ strip_equal(x, y) = strip(x) == strip(y)
4949

5050
# Here we reference test all the permutations of the AutoMerge comments.
5151
# This allows us to see the diffs in PRs that change the AutoMerge comment.
52+
# You can set `ENV["JULIA_REFERENCETESTS_UPDATE"] = true` to easily update the reference tests.
5253
function comment_reference_test()
5354
for pass in (true, false),
5455
(type_name,type) in (("new_version", AutoMerge.NewVersion()), ("new_package", AutoMerge.NewPackage())),

test/reference_comments/comment_pass_false_type_new_package_suggest_onepointzero_false_version_0.1.0_point_to_slack_false.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Please make sure that you have read the [package naming guidelines](https://juli
2929

3030
</details>
3131

32-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
32+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
3333
<details><summary>Example of adding release notes with breaking notice</summary>
3434

3535
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -46,6 +46,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
4646
```
4747

4848
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
49+
50+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4951
</details>
5052

5153

@@ -66,6 +68,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
6668
```
6769

6870
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
71+
72+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6973
</details>
7074

7175

test/reference_comments/comment_pass_false_type_new_package_suggest_onepointzero_false_version_0.1.0_point_to_slack_true.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Please make sure that you have read the [package naming guidelines](https://juli
2929

3030
</details>
3131

32-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
32+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
3333
<details><summary>Example of adding release notes with breaking notice</summary>
3434

3535
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -46,6 +46,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
4646
```
4747

4848
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
49+
50+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4951
</details>
5052

5153

@@ -66,6 +68,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
6668
```
6769

6870
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
71+
72+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6973
</details>
7074

7175

test/reference_comments/comment_pass_false_type_new_package_suggest_onepointzero_false_version_1.0.0_point_to_slack_false.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Please make sure that you have read the [package naming guidelines](https://juli
2929

3030
</details>
3131

32-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
32+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
3333
<details><summary>Example of adding release notes with breaking notice</summary>
3434

3535
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -46,6 +46,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
4646
```
4747

4848
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
49+
50+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4951
</details>
5052

5153

@@ -66,6 +68,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
6668
```
6769

6870
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
71+
72+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6973
</details>
7074

7175

test/reference_comments/comment_pass_false_type_new_package_suggest_onepointzero_false_version_1.0.0_point_to_slack_true.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Please make sure that you have read the [package naming guidelines](https://juli
2929

3030
</details>
3131

32-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
32+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
3333
<details><summary>Example of adding release notes with breaking notice</summary>
3434

3535
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -46,6 +46,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
4646
```
4747

4848
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
49+
50+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4951
</details>
5052

5153

@@ -66,6 +68,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
6668
```
6769

6870
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
71+
72+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6973
</details>
7074

7175

test/reference_comments/comment_pass_false_type_new_package_suggest_onepointzero_true_version_0.1.0_point_to_slack_false.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Please make sure that you have read the [package naming guidelines](https://juli
2929

3030
</details>
3131

32-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
32+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
3333
<details><summary>Example of adding release notes with breaking notice</summary>
3434

3535
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -46,6 +46,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
4646
```
4747

4848
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
49+
50+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4951
</details>
5052

5153

@@ -66,6 +68,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
6668
```
6769

6870
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
71+
72+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6973
</details>
7074

7175

test/reference_comments/comment_pass_false_type_new_package_suggest_onepointzero_true_version_0.1.0_point_to_slack_true.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Please make sure that you have read the [package naming guidelines](https://juli
2929

3030
</details>
3131

32-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
32+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
3333
<details><summary>Example of adding release notes with breaking notice</summary>
3434

3535
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -46,6 +46,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
4646
```
4747

4848
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
49+
50+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4951
</details>
5052

5153

@@ -66,6 +68,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
6668
```
6769

6870
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
71+
72+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6973
</details>
7074

7175

test/reference_comments/comment_pass_false_type_new_package_suggest_onepointzero_true_version_1.0.0_point_to_slack_false.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Please make sure that you have read the [package naming guidelines](https://juli
2929

3030
</details>
3131

32-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
32+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
3333
<details><summary>Example of adding release notes with breaking notice</summary>
3434

3535
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -46,6 +46,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
4646
```
4747

4848
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
49+
50+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4951
</details>
5052

5153

@@ -66,6 +68,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
6668
```
6769

6870
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
71+
72+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6973
</details>
7074

7175

test/reference_comments/comment_pass_false_type_new_package_suggest_onepointzero_true_version_1.0.0_point_to_slack_true.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Please make sure that you have read the [package naming guidelines](https://juli
2929

3030
</details>
3131

32-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
32+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
3333
<details><summary>Example of adding release notes with breaking notice</summary>
3434

3535
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -46,6 +46,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
4646
```
4747

4848
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
49+
50+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4951
</details>
5052

5153

@@ -66,6 +68,8 @@ Please make sure that you have read the [package naming guidelines](https://juli
6668
```
6769

6870
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
71+
72+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6973
</details>
7074

7175

test/reference_comments/comment_pass_false_type_new_version_suggest_onepointzero_false_version_0.1.0_point_to_slack_false.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Hello, I am an automated registration bot. I help manage the registration proces
2525

2626
</details>
2727

28-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
28+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
2929
<details><summary>Example of adding release notes with breaking notice</summary>
3030

3131
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -42,6 +42,8 @@ Hello, I am an automated registration bot. I help manage the registration proces
4242
```
4343

4444
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
45+
46+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4547
</details>
4648

4749

@@ -62,6 +64,8 @@ Hello, I am an automated registration bot. I help manage the registration proces
6264
```
6365

6466
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
67+
68+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6569
</details>
6670

6771

test/reference_comments/comment_pass_false_type_new_version_suggest_onepointzero_false_version_0.1.0_point_to_slack_true.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Hello, I am an automated registration bot. I help manage the registration proces
2525

2626
</details>
2727

28-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
28+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
2929
<details><summary>Example of adding release notes with breaking notice</summary>
3030

3131
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -42,6 +42,8 @@ Hello, I am an automated registration bot. I help manage the registration proces
4242
```
4343

4444
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
45+
46+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4547
</details>
4648

4749

@@ -62,6 +64,8 @@ Hello, I am an automated registration bot. I help manage the registration proces
6264
```
6365

6466
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
67+
68+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6569
</details>
6670

6771

test/reference_comments/comment_pass_false_type_new_version_suggest_onepointzero_false_version_1.0.0_point_to_slack_false.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Hello, I am an automated registration bot. I help manage the registration proces
2525

2626
</details>
2727

28-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
28+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
2929
<details><summary>Example of adding release notes with breaking notice</summary>
3030

3131
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -42,6 +42,8 @@ Hello, I am an automated registration bot. I help manage the registration proces
4242
```
4343

4444
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
45+
46+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4547
</details>
4648

4749

@@ -62,6 +64,8 @@ Hello, I am an automated registration bot. I help manage the registration proces
6264
```
6365

6466
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
67+
68+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6569
</details>
6670

6771

test/reference_comments/comment_pass_false_type_new_version_suggest_onepointzero_false_version_1.0.0_point_to_slack_true.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Hello, I am an automated registration bot. I help manage the registration proces
2525

2626
</details>
2727

28-
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes.
28+
- This is a breaking change, but the release notes do not mention it. Please add a mention of the breaking change to the release notes (use the words "breaking" or "changelog").
2929
<details><summary>Example of adding release notes with breaking notice</summary>
3030

3131
If you are using the comment bot `@JuliaRegistrator`, you can add release notes to this registration by re-triggering registration while specifying release notes:
@@ -42,6 +42,8 @@ Hello, I am an automated registration bot. I help manage the registration proces
4242
```
4343

4444
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
45+
46+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
4547
</details>
4648

4749

@@ -62,6 +64,8 @@ Hello, I am an automated registration bot. I help manage the registration proces
6264
```
6365

6466
If you are using JuliaHub, trigger registration the same way you did the first time, but enter release notes that specify the breaking changes.
67+
68+
Either way, you need to mention the words "breaking" or "changelog", even if it is just to say "there are no breaking changes", or "see the changelog".
6569
</details>
6670

6771

0 commit comments

Comments
 (0)