AutoMerge: Allow skipping sequential versions with author-approval criteria

docs/src/guidelines.md

@@ -22,6 +22,8 @@ function guidelines_to_markdown_output(guidelines_function::Function)
         check_license = true,
         this_is_jll_package = false,
         this_pr_can_use_special_jll_exceptions = false,
+        use_distance_check = false,
+        author_approved = false
     )
     filter!(x -> x[1] != :update_status, guidelines)
     filter!(x -> !(x[1].docs isa Nothing), guidelines)
@@ -50,6 +52,8 @@ function guidelines_to_markdown_output(guidelines_function::Function)
         check_license = true,
         this_is_jll_package = false,
         this_pr_can_use_special_jll_exceptions = false,
+        use_distance_check = false,
+        author_approved = false
     )
     filter!(x -> x[1] != :update_status, guidelines)
     filter!(x -> !(x[1].docs isa Nothing), guidelines)

docs/src/private-registries.md

@@ -99,3 +99,7 @@ In that case you will also have to add the following
 + - run: chmod +x .ci/instantiate.sh
 ```
 in `ci.yml` and also `TagBotTriggers.yml` and `automerge.yml` (in which the above appears twice) files if those features are used.
+
+## Author approval workflow support
+
+Some guidelines allow the person invoking registration (typically the package author) to "approve" AutoMerge even if the guideline is not passing. This is facilitated by a labelling workflow `author_approval.yml` that must run on the registry in order to translate author-approval comments into labels that AutoMerge can use. The [General registry's workflows](https://github.com/JuliaRegistries/General/tree/master/.github/workflows) should once again be used as an example.

example_github_workflow_files/automerge.yml

@@ -4,10 +4,17 @@ on:
   schedule:
     - cron: '05,17,29,41,53 * * * *'
   pull_request:
+    # Here we run when labels are applied, so that the "Override AutoMerge: name similarity is okay label is respected.
+    types: [labeled, synchronize]
   workflow_dispatch:
 
 jobs:
   AutoMerge:
+    # Run if the we are not triggered by a label OR we are triggered by a label, and that
+    # label is one that affects the execution of the workflow
+    # Note: since the label contains a colon, we need to use a workaround like https://github.com/actions/runner/issues/1019#issuecomment-810482716
+    # for the syntax to parse correctly.
+    if: "${{  github.event.action != 'labeled' || (github.event.action == 'labeled' && (github.event.label.name == 'Override AutoMerge: name similarity is okay' || github.event.label.name == 'package-author-approved')) }}"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:

src/AutoMerge/cron.jl

@@ -55,7 +55,11 @@ function all_specified_check_runs_passed(
     return all(values(check_passed))
 end
 
-pr_comment_is_blocking(c::GitHub.Comment) = !occursin("[noblock]", body(c))
+function pr_comment_is_blocking(c::GitHub.Comment)
+    # Note: `merge_approved` is not case sensitive, to match the semantics of `contains` on GHA
+    not_blocking = occursin("[noblock]", body(c)) || occursin("merge approved", lowercase(body(c)))
+    return !not_blocking
+end
 
 function pr_has_no_blocking_comments(
     api::GitHub.GitHubAPI,

src/AutoMerge/guidelines.jl

@@ -265,6 +265,8 @@ To prevent confusion between similarly named packages, the names of new packages
       [VisualStringDistances.jl](https://github.com/ericphanson/VisualStringDistances.jl)
       between the package name and any existing package must exceeds a certain
       a hand-chosen threshold (currently 2.5).
+
+These checks can be overridden by applying a label `Override AutoMerge: name similarity is okay` to the PR. This will turn off the check as long as the label is applied to the PR.
   """,
     check=data -> meets_distance_check(data.pkg, data.registry_master),
 )
@@ -373,6 +375,24 @@ function meets_distance_check(
     return (false, message)
 end
 
+# Used in `pull_request_build` to determine if we should
+# perform the distance check or not.
+# We expect to be passed the `labels` field of a PullRequest:
+# <https://github.com/JuliaWeb/GitHub.jl/blob/d24bd6798609ae356db308d65577e99aad0cf432/src/issues/pull_requests.jl#L33>
+function perform_distance_check(labels)
+    # No labels? Do the check
+    isnothing(labels) && return true
+    for label in labels
+        if label.name === "Override AutoMerge: name similarity is okay"
+            # found the override! Skip the check
+            @debug "Found label; skipping distance check" label.name
+            return false
+        end
+    end
+    # Did not find the override. Perform the check.
+    return true
+end
+
 const guideline_normal_capitalization = Guideline(;
     info="Normal capitalization",
     docs=string(
@@ -441,6 +461,10 @@ function _valid_change(old_version::VersionNumber, new_version::VersionNumber)
     end
 end
 
+const AUTHOR_APPROVAL_INSTRUCTIONS = string(
+    "**If this was not a mistake and you wish to merge this PR anyway,",
+    "write a comment that says \"merge approved\".**")
+
 const guideline_sequential_version_number = Guideline(;
     info="Sequential version number",
     docs=string(
@@ -451,6 +475,7 @@ const guideline_sequential_version_number = Guideline(;
         "valid new versions are `1.0.1`, `1.1.1`, `1.2.0` and `2.0.0`. ",
         "Invalid new versions include `1.0.2` (skips `1.0.1`), ",
         "`1.3.0` (skips `1.2.0`), `3.0.0` (skips `2.0.0`) etc.",
+        AUTHOR_APPROVAL_INSTRUCTIONS
     ),
     check=data -> meets_sequential_version_number(
         data.pkg,
@@ -956,6 +981,8 @@ function get_automerge_guidelines(
     check_license::Bool,
     this_is_jll_package::Bool,
     this_pr_can_use_special_jll_exceptions::Bool,
+    use_distance_check::Bool,
+    author_approved::Bool # currently unused for new packages
 )
     guidelines = [
         (guideline_registry_consistency_tests_pass, true),
@@ -987,7 +1014,7 @@ function get_automerge_guidelines(
         # prints the list of similar package names in
         # the automerge comment. To make the comment easy
         # to read, we want this list to be at the end.
-        (guideline_distance_check, true),
+        (guideline_distance_check, use_distance_check),
     ]
     return guidelines
 end
@@ -997,11 +1024,13 @@ function get_automerge_guidelines(
     check_license::Bool,
     this_is_jll_package::Bool,
     this_pr_can_use_special_jll_exceptions::Bool,
+    use_distance_check::Bool, # unused for new versions
+    author_approved::Bool
 )
     guidelines = [
         (guideline_registry_consistency_tests_pass, true),
         (guideline_pr_only_changes_allowed_files, true),
-        (guideline_sequential_version_number, !this_pr_can_use_special_jll_exceptions),
+        (guideline_sequential_version_number, !this_pr_can_use_special_jll_exceptions && !author_approved),
         (guideline_version_number_no_prerelease, true),
         (guideline_version_number_no_build, !this_pr_can_use_special_jll_exceptions),
         (guideline_compat_for_julia, true),

src/AutoMerge/pull_requests.jl

@@ -195,6 +195,8 @@ function pull_request_build(data::GitHubAutoMergeData; check_license)::Nothing
         check_license=check_license,
         this_is_jll_package=this_is_jll_package,
         this_pr_can_use_special_jll_exceptions=this_pr_can_use_special_jll_exceptions,
+        use_distance_check=perform_distance_check(data.pr.labels),
+        author_approved=has_author_approved_label(data.pr.labels)
     )
     checked_guidelines = Guideline[]
 

src/AutoMerge/util.jl

@@ -288,3 +288,19 @@ function get_all_non_jll_package_names(registry_dir::AbstractString)
     unique!(packages)
     return packages
 end
+
+const AUTHOR_APPROVED_LABEL = "package-author-approved"
+
+function has_author_approved_label(labels)
+    # No labels? Not approved
+    isnothing(labels) && return false
+    for label in labels
+        if label.name === AUTHOR_APPROVED_LABEL
+            # found the approval
+            @debug "Found `$(AUTHOR_APPROVED_LABEL)` label"
+            return true
+        end
+    end
+    # Did not find approval
+    return false
+end

test/automerge-unit.jl

@@ -123,6 +123,25 @@ end
             "ReallyLooooongNameCD", ["ReallyLooooongNameAB"]
         )[1]
     end
+    @testset "perform_distance_check" begin
+        @test AutoMerge.perform_distance_check(nothing)
+        @test AutoMerge.perform_distance_check([GitHub.Label(; name="hi")])
+        @test !AutoMerge.perform_distance_check([GitHub.Label(; name="Override AutoMerge: name similarity is okay")])
+        @test !AutoMerge.perform_distance_check([GitHub.Label(; name="hi"), GitHub.Label(; name="Override AutoMerge: name similarity is okay")])
+    end
+    @testset "has_author_approved_label" begin
+        @test !AutoMerge.has_author_approved_label(nothing)
+        @test !AutoMerge.has_author_approved_label([GitHub.Label(; name="hi")])
+        @test AutoMerge.has_author_approved_label([GitHub.Label(; name="package-author-approved")])
+        @test AutoMerge.has_author_approved_label([GitHub.Label(; name="hi"), GitHub.Label(; name="package-author-approved")])
+    end
+    @testset "pr_comment_is_blocking" begin
+        @test AutoMerge.pr_comment_is_blocking(GitHub.Comment(; body="hi"))
+        @test AutoMerge.pr_comment_is_blocking(GitHub.Comment(; body="block"))
+        @test !AutoMerge.pr_comment_is_blocking(GitHub.Comment(; body="[noblock]"))
+        @test !AutoMerge.pr_comment_is_blocking(GitHub.Comment(; body="[noblock]hi"))
+        @test !AutoMerge.pr_comment_is_blocking(GitHub.Comment(; body="merge approved abc"))
+    end
     @testset "`get_all_non_jll_package_names`" begin
         registry_path = joinpath(DEPOT_PATH[1], "registries", "General")
         packages = AutoMerge.get_all_non_jll_package_names(registry_path)
@@ -617,7 +636,7 @@ end
             @test result[1]
             result = has_osi_license_in_depot("VisualStringDistances")
             @test result[1]
-    
+
             # Now, what happens if there's also a non-OSI license in another file?
             pkg_path = pkgdir_from_depot(tmp_depot, "UnbalancedOptimalTransport")
             open(joinpath(pkg_path, "LICENSE2"); write=true) do io
@@ -627,12 +646,12 @@ end
             end
             result = has_osi_license_in_depot("UnbalancedOptimalTransport")
             @test result[1]
-    
+
             # What if we also remove the original license, leaving only the CC0 license?
             rm(joinpath(pkg_path, "LICENSE"))
             result = has_osi_license_in_depot("UnbalancedOptimalTransport")
             @test !result[1]
-    
+
             # What about no license at all?
             pkg_path = pkgdir_from_depot(tmp_depot, "VisualStringDistances")
             rm(joinpath(pkg_path, "LICENSE"))