Skip to content

Commit

Permalink
Merge #345
Browse files Browse the repository at this point in the history
345: Several improvements to the AutoMerge fail comments r=DilumAluthge a=DilumAluthge



Co-authored-by: Dilum Aluthge <dilum@aluthge.com>
  • Loading branch information
bors[bot] and DilumAluthge authored Jan 19, 2021
2 parents 882bd1e + 62e3739 commit e816a67
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "RegistryCI"
uuid = "0c95cc5f-2f7e-43fe-82dd-79dbcba86b32"
authors = ["Dilum Aluthge <dilum@aluthge.com>", "Fredrik Ekre <ekrefredrik@gmail.com>", "contributors"]
version = "6.3.0"
version = "6.3.1"

[deps]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand Down
14 changes: 13 additions & 1 deletion src/AutoMerge/util.jl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,19 @@ function _comment_disclaimer()
"Note that the guidelines are only required for the pull request ",
"to be merged automatically. However, it is **strongly recommended** ",
"to follow them, since otherwise the pull request needs to be ",
"manually reviewed and merged by a human.")
"manually reviewed and merged by a human.",
"\n\n",
"After you have fixed the AutoMerge issues, simple retrigger Registrator, ",
"which will automatically update this pull request. ",
"You do not need to change the version number in your `Project.toml` file ",
"(unless of course the AutoMerge issue is that you skipped a version number, ",
"in which case you should change the version number).",
"",
"\n\n",
"If you do not want to fix the AutoMerge issues, please post a comment ",
"explaining why you would like this pull request to be manually merged.",
"",
)
return result
end

Expand Down

2 comments on commit e816a67

@DilumAluthge
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/28242

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v6.3.1 -m "<description of version>" e816a679acf89d73c1f452068ab48876c1d05987
git push origin v6.3.1

Please sign in to comment.