Skip to content

Revert "allow artifact string macro to take an explicit path to the artifact file" #50036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2023
Merged

Revert "allow artifact string macro to take an explicit path to the artifact file" #50036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions stdlib/Artifacts/src/Artifacts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,18 +654,13 @@ access a single file/directory within an artifact. Example:
!!! compat "Julia 1.6"
Slash-indexing requires at least Julia 1.6.
"""
macro artifact_str(name, platform=nothing, artifacts_toml_path=nothing)
macro artifact_str(name, platform=nothing)
# Find Artifacts.toml file we're going to load from
srcfile = string(__source__.file)
if ((isinteractive() && startswith(srcfile, "REPL[")) || (!isinteractive() && srcfile == "none")) && !isfile(srcfile)
srcfile = pwd()
end
# Sometimes we know the exact path to the Artifacts.toml file, so we can save some lookups
local artifacts_toml = if artifacts_toml_path === nothing || artifacts_toml_path == :(nothing)
find_artifacts_toml(srcfile)
else
eval(artifacts_toml_path)
end
local artifacts_toml = find_artifacts_toml(srcfile)
if artifacts_toml === nothing
error(string(
"Cannot locate '(Julia)Artifacts.toml' file when attempting to use artifact '",
Expand Down Expand Up @@ -695,7 +690,7 @@ macro artifact_str(name, platform=nothing, artifacts_toml_path=nothing)

# If `name` is a constant, (and we're using the default `Platform`) we can actually load
# and parse the `Artifacts.toml` file now, saving the work from runtime.
if isa(name, AbstractString) && (platform === nothing || platform == :(nothing))
if isa(name, AbstractString) && platform === nothing
# To support slash-indexing, we need to split the artifact name from the path tail:
platform = HostPlatform()
artifact_name, artifact_path_tail, hash = artifact_slash_lookup(name, artifact_dict, artifacts_toml, platform)
Expand Down
3 changes: 0 additions & 3 deletions stdlib/Artifacts/test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@ end
HelloWorldC_exe_path = joinpath(HelloWorldC_dir, "bin", "hello_world$(exeext)")
@test isfile(HelloWorldC_exe_path)

HelloWorldC_dir_explicit_artifact = eval(:(@artifact_str "HelloWorldC" nothing joinpath(@__DIR__, "Artifacts.toml")))
@test isdir(HelloWorldC_dir_explicit_artifact)

# Simple slash-indexed lookup
HelloWorldC_bin_path = artifact"HelloWorldC/bin"
@test isdir(HelloWorldC_bin_path)
Expand Down