Skip to content

Commit

Permalink
Set R_HOME to "*" (#139)
Browse files Browse the repository at this point in the history
* Update Project.toml

* Update guidelines.jl
  • Loading branch information
DilumAluthge authored Dec 12, 2019
1 parent 1ef05bb commit 08c73fd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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 <[email protected]>", "Fredrik Ekre <[email protected]>"]
version = "0.4.3"
version = "0.4.4"

[deps]
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Expand Down
6 changes: 4 additions & 2 deletions src/AutoMerge/guidelines.jl
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ function meets_version_can_be_loaded(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 three environment variables:
# our token. So we only pass four environment variables:
# 1. PATH. If we don't pass PATH, things break. And PATH should not contain any
# sensitive information.
# 2. PYTHON. We set PYTHON to the empty string. This forces any packages that use
Expand All @@ -177,10 +177,12 @@ function meets_version_can_be_loaded(working_directory::String,
# 3. JULIA_DEPOT_PATH. We set JULIA_DEPOT_PATH to the temporary directory that
# we created. This is because we don't want the child process using our
# real Julia depot. So we set up a fake depot for the child process to use.
# 4. R_HOME. We set R_HOME to "*".
cmd = Cmd(`$(Base.julia_cmd()) -e $(code)`;
env = Dict("PATH" => ENV["PATH"],
"PYTHON" => "",
"JULIA_DEPOT_PATH" => tmp_dir))
"JULIA_DEPOT_PATH" => tmp_dir,
"R_HOME" => "*"))
# GUI toolkits may need a display just to load the package
xvfb = Sys.which("xvfb-run")
@debug("xvfb: ", xvfb)
Expand Down

4 comments on commit 08c73fd

@DilumAluthge
Copy link
Member Author

Choose a reason for hiding this comment

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

@JuliaRegistrator register branch=master

@DilumAluthge
Copy link
Member Author

Choose a reason for hiding this comment

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

@JuliaRegistrator register branch=master

@DilumAluthge
Copy link
Member Author

Choose a reason for hiding this comment

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

@JuliaRegistrator register branch=master

@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/6636

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 Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v0.4.4 -m "<description of version>" 08c73fdd9a76d3ac9b9b95d6b044336232e9d4ad
git push origin v0.4.4

Please sign in to comment.