Skip to content

Commit

Permalink
fixup!
Browse files Browse the repository at this point in the history
  • Loading branch information
aviatesk committed Apr 18, 2023
1 parent 78d1114 commit 2f54918
Show file tree
Hide file tree
Showing 6 changed files with 1,589 additions and 113 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Manifest.toml linguist-generated=true
14 changes: 9 additions & 5 deletions src/BaseBenchmarks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,17 @@ function load!(group::BenchmarkGroup, id::AbstractString; tune::Bool = true)
# We allow our individual benchmark groups to have their own Project.toml file
# but each of those should have the top-level `BaseBenchmarks` project dev'ed
# out to a relative path of `../..`.
project_path = joinpath(@__DIR__, id, "Project.toml")
if !isfile(project_path)
version_specific_path = joinpath(@__DIR__, id, "$(VERSION.major).$(VERSION.minor)", "Project.toml")
general_path = joinpath(@__DIR__, id, "Project.toml")
if isfile(version_specific_path)
needs_instantiate = true
project_path = version_specific_path
elseif isfile(general_path)
needs_instantiate = true
project_path = general_path
else
project_path = Base.active_project()
needs_instantiate = false
else
# run(`$(Base.julia_cmd()) --project=$(project_path) -e 'using Pkg; Pkg.instantiate()'`)
needs_instantiate = true
end

Pkg.activate(project_path) do
Expand Down
Loading

0 comments on commit 2f54918

Please sign in to comment.