Skip to content

Commit 2f54918

Browse files
committed
fixup!
1 parent 78d1114 commit 2f54918

File tree

6 files changed

+1589
-113
lines changed

6 files changed

+1589
-113
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Manifest.toml linguist-generated=true

src/BaseBenchmarks.jl

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,17 @@ function load!(group::BenchmarkGroup, id::AbstractString; tune::Bool = true)
4444
# We allow our individual benchmark groups to have their own Project.toml file
4545
# but each of those should have the top-level `BaseBenchmarks` project dev'ed
4646
# out to a relative path of `../..`.
47-
project_path = joinpath(@__DIR__, id, "Project.toml")
48-
if !isfile(project_path)
47+
version_specific_path = joinpath(@__DIR__, id, "$(VERSION.major).$(VERSION.minor)", "Project.toml")
48+
general_path = joinpath(@__DIR__, id, "Project.toml")
49+
if isfile(version_specific_path)
50+
needs_instantiate = true
51+
project_path = version_specific_path
52+
elseif isfile(general_path)
53+
needs_instantiate = true
54+
project_path = general_path
55+
else
4956
project_path = Base.active_project()
5057
needs_instantiate = false
51-
else
52-
# run(`$(Base.julia_cmd()) --project=$(project_path) -e 'using Pkg; Pkg.instantiate()'`)
53-
needs_instantiate = true
5458
end
5559

5660
Pkg.activate(project_path) do

0 commit comments

Comments
 (0)