Skip to content

Commit c697995

Browse files
Merge #409
409: A few tweaks to the docs for AutoMerge guidelines r=DilumAluthge a=DilumAluthge I've bumped the version number because the `stable` docs link is not updated unless we register and tag a new release. Co-authored-by: Dilum Aluthge <[email protected]>
2 parents 213c14e + 0e6db85 commit c697995

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
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 <[email protected]>", "Fredrik Ekre <[email protected]>", "contributors"]
4-
version = "7.1.4"
4+
version = "7.1.5"
55

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

docs/src/guidelines.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ CurrentModule = RegistryCI
44

55
# Automatic merging guidelines
66

7+
These are the guidelines that a pull request must pass in order to be automatically merged.
8+
9+
All of those guidelines are enabled on the General registry.
10+
11+
For other registries, some of these guidelines can be disabled.
12+
713
## New packages
814

915
```@eval

src/AutoMerge/guidelines.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,9 @@ const guideline_version_has_osi_license = Guideline(;
591591
"License: The package should have an ",
592592
"[OSI-approved software license](https://opensource.org/licenses/alphabetical) ",
593593
"located in the top-level directory of the package code, ",
594-
"e.g. in a file named `LICENSE` or `LICENSE.md`.",
594+
"e.g. in a file named `LICENSE` or `LICENSE.md`. ",
595+
"This check is required for the General registry. ",
596+
"For other registries, registry maintainers have the option to disable this check.",
595597
),
596598
check = data -> meets_version_has_osi_license(
597599
data.pkg;

0 commit comments

Comments
 (0)