From 55a545062f1c5065373ec13dba0cbb8da51c2d17 Mon Sep 17 00:00:00 2001 From: Kristoffer Date: Thu, 1 Aug 2024 12:27:08 +0200 Subject: [PATCH 1/4] do a little bit of work to try confirm that the git repo found is actually a julia repo before running `Core.Compiler` test --- test/runtests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runtests.jl b/test/runtests.jl index ff146a54..0121cd59 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -2880,7 +2880,7 @@ const issue639report = [] # Determine whether a git repo is available. Travis & Appveyor do not have this. repo, path = Revise.git_repo(Revise.juliadir) - if repo != nothing + if repo != nothing && isfile(joinpath(path, "VERSION")) && isdir(joinpath(path, "base")) # Tracking Core.Compiler Revise.track(Core.Compiler) id = Base.PkgId(Core.Compiler) From d6a7ea8e020c103f1c6789ff7073562b25da8806 Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Wed, 14 Aug 2024 15:16:56 +0200 Subject: [PATCH 2/4] do not run on buildkite --- test/runtests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runtests.jl b/test/runtests.jl index 0121cd59..d79ed1f6 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -2880,7 +2880,7 @@ const issue639report = [] # Determine whether a git repo is available. Travis & Appveyor do not have this. repo, path = Revise.git_repo(Revise.juliadir) - if repo != nothing && isfile(joinpath(path, "VERSION")) && isdir(joinpath(path, "base")) + if !haskey(ENV, "BUILDKITE") && repo != nothing && isfile(joinpath(path, "VERSION")) && isdir(joinpath(path, "base")) # Tracking Core.Compiler Revise.track(Core.Compiler) id = Base.PkgId(Core.Compiler) From f1241af6f76a26b65b081ddb6a91f0498411e9dd Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Wed, 14 Aug 2024 16:12:53 +0200 Subject: [PATCH 3/4] Update runtests.jl --- test/runtests.jl | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index d79ed1f6..1c35fa53 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -2878,19 +2878,21 @@ const issue639report = [] Revise.get_tracked_id(Core) # just test that this doesn't error - # Determine whether a git repo is available. Travis & Appveyor do not have this. - repo, path = Revise.git_repo(Revise.juliadir) - if !haskey(ENV, "BUILDKITE") && repo != nothing && isfile(joinpath(path, "VERSION")) && isdir(joinpath(path, "base")) - # Tracking Core.Compiler - Revise.track(Core.Compiler) - id = Base.PkgId(Core.Compiler) - pkgdata = Revise.pkgdatas[id] - @test any(k->endswith(k, "optimize.jl"), Revise.srcfiles(pkgdata)) - m = first(methods(Core.Compiler.typeinf_code)) - @test definition(m) isa Expr - else - @test_throws Revise.GitRepoException Revise.track(Core.Compiler) - @warn "skipping Core.Compiler tests due to lack of git repo" + if !haskey(ENV, "BUILDKITE") # disable on buildkite, see discussion in https://github.com/JuliaCI/julia-buildkite/pull/372#issuecomment-2262840304 + # Determine whether a git repo is available. Travis & Appveyor do not have this. + repo, path = Revise.git_repo(Revise.juliadir) + if && repo != nothing && isfile(joinpath(path, "VERSION")) && isdir(joinpath(path, "base")) + # Tracking Core.Compiler + Revise.track(Core.Compiler) + id = Base.PkgId(Core.Compiler) + pkgdata = Revise.pkgdatas[id] + @test any(k->endswith(k, "optimize.jl"), Revise.srcfiles(pkgdata)) + m = first(methods(Core.Compiler.typeinf_code)) + @test definition(m) isa Expr + else + @test_throws Revise.GitRepoException Revise.track(Core.Compiler) + @warn "skipping Core.Compiler tests due to lack of git repo" + end end end From 3e5ddf0a3aced588cc23b6e6f8b99656f707519d Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Wed, 14 Aug 2024 16:16:34 +0200 Subject: [PATCH 4/4] dsadasdsa --- test/runtests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runtests.jl b/test/runtests.jl index 1c35fa53..970e1ff5 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -2881,7 +2881,7 @@ const issue639report = [] if !haskey(ENV, "BUILDKITE") # disable on buildkite, see discussion in https://github.com/JuliaCI/julia-buildkite/pull/372#issuecomment-2262840304 # Determine whether a git repo is available. Travis & Appveyor do not have this. repo, path = Revise.git_repo(Revise.juliadir) - if && repo != nothing && isfile(joinpath(path, "VERSION")) && isdir(joinpath(path, "base")) + if repo != nothing && isfile(joinpath(path, "VERSION")) && isdir(joinpath(path, "base")) # Tracking Core.Compiler Revise.track(Core.Compiler) id = Base.PkgId(Core.Compiler)