From 363bad5ab17cfafd59dd904bc3e81c5613ef1ba3 Mon Sep 17 00:00:00 2001
From: Chris de Graaf <me@cdg.dev>
Date: Mon, 7 Dec 2020 11:18:42 -0600
Subject: [PATCH 1/3] Pass HOME to subprocesses

---
 src/AutoMerge/guidelines.jl | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/AutoMerge/guidelines.jl b/src/AutoMerge/guidelines.jl
index a08a3342..6fbeef82 100644
--- a/src/AutoMerge/guidelines.jl
+++ b/src/AutoMerge/guidelines.jl
@@ -115,7 +115,7 @@ function meets_name_ascii(pkg)
 end
 
 function meets_julia_name_check(pkg)
-    if occursin("julia", lowercase(pkg)) 
+    if occursin("julia", lowercase(pkg))
         return false, "Lowercase package name $(lowercase(pkg)) contains the string \"julia\"."
     elseif startswith(pkg, "Ju")
         return false, "Package name starts with \"Ju\"."
@@ -150,7 +150,7 @@ function meets_distance_check(pkg_name, other_packages; DL_lowercase_cutoff = 1,
             if dl_lowercase <= DL_lowercase_cutoff
                 msg = string(msg, " Damerau-Levenshtein distance $(dl_lowercase) between lowercased names is at or below cutoff of $(DL_lowercase_cutoff).")
             end
-            
+
             # Distance check 3: normalized visual distance,
             # gated by a `dl` check for speed.
             if (sqrt_normalized_vd_cutoff > 0 && dl <= 4)
@@ -169,7 +169,7 @@ function meets_distance_check(pkg_name, other_packages; DL_lowercase_cutoff = 1,
             end
         end
     end
-    
+
     isempty(problem_messages) && return (true, "")
     sort!(problem_messages, by = Base.tail)
     message = string("Package name similar to $(length(problem_messages)) existing package",
@@ -429,24 +429,22 @@ function _run_pkg_commands(working_directory::String,
     #    PyCall to install their own version of Python instead of using the system
     #    Python.
     # 8. R_HOME. We set R_HOME to "*".
-    env = Dict{String, String}()
-    if haskey(ENV, "HTTP_PROXY")
-        env["HTTP_PROXY"] = deepcopy(ENV["HTTP_PROXY"])
-    end
-    if haskey(ENV, "HTTPS_PROXY")
-        env["HTTPS_PROXY"] = deepcopy(ENV["HTTPS_PROXY"])
-    end
-    env["JULIA_DEPOT_PATH"] = deepcopy(tmp_dir_2)
-    if haskey(ENV, "JULIA_PKG_SERVER")
-        env["JULIA_PKG_SERVER"] = deepcopy(ENV["JULIA_PKG_SERVER"])
+    # 9. HOME. Lots of things need HOME.
+
+    env = Dict(
+        "JULIA_DEPOT_PATH" => tmp_dir_2,
+        "JULIA_REGISTRYCI_AUTOMERGE" => "true",
+        "PYTHON" => "",
+        "R_HOME" => "*",
+    )
+    for k in ("HOME", "PATH", "HTTP_PROXY", "HTTPS_PROXY", "JULIA_PKG_SERVER")
+        if haskey(ENV, k)
+            env[k] = ENV[k]
+        end
     end
-    env["JULIA_REGISTRYCI_AUTOMERGE"] = "true"
-    env["PATH"] = deepcopy(ENV["PATH"])
-    env["PYTHON"] = ""
-    env["R_HOME"] = "*"
 
-    cmd = Cmd(`$(Base.julia_cmd()) -e $(code)`;
-              env = env)
+    cmd = Cmd(`$(Base.julia_cmd()) -e $(code)`; env=env)
+
     # GUI toolkits may need a display just to load the package
     xvfb = Sys.which("xvfb-run")
     @info("xvfb: ", xvfb)

From 9b2d59a37fa89c76a7964467a1ec0d9961141b71 Mon Sep 17 00:00:00 2001
From: Chris de Graaf <me@cdg.dev>
Date: Mon, 7 Dec 2020 14:37:38 -0600
Subject: [PATCH 2/3] A simpler word

---
 src/AutoMerge/guidelines.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AutoMerge/guidelines.jl b/src/AutoMerge/guidelines.jl
index 6fbeef82..13135878 100644
--- a/src/AutoMerge/guidelines.jl
+++ b/src/AutoMerge/guidelines.jl
@@ -415,7 +415,7 @@ function _run_pkg_commands(working_directory::String,
     # process. For example, we don't want to pass an environment variable containing
     # our GitHub token to the child process. Because if the Julia package that we are
     # testing has malicious code in its __init__() function, it could try to steal
-    # our token. So we only pass eight environment variables:
+    # our token. So we only pass these environment variables:
     # 1. HTTP_PROXY. If it's set, it is delegated to the child process.
     # 2. HTTPS_PROXY. If it's set, it is delegated to the child process.
     # 3. JULIA_DEPOT_PATH. We set JULIA_DEPOT_PATH to the temporary directory that

From 9d60ae85b54dab5043617befc155ea97431ccbca Mon Sep 17 00:00:00 2001
From: Chris de Graaf <me@cdg.dev>
Date: Tue, 8 Dec 2020 13:33:14 -0600
Subject: [PATCH 3/3] Don't require version bump

---
 bors.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bors.toml b/bors.toml
index 391f065a..43e3573f 100644
--- a/bors.toml
+++ b/bors.toml
@@ -6,7 +6,7 @@ status = [
     # "codecov/patch",
     # "codecov/project",
     "Travis CI - Branch",
-    "VersionVigilante",
+    # "VersionVigilante",
 ]
 
 timeout_sec = 10800