bump cov - up ci.yml - fix tests on local build (#96)

Author: t-bltg

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.0'
+          - '1.6'  # latest LTS
           - '1'
           - 'nightly'
         os:
@@ -25,36 +25,36 @@ jobs:
         arch:
           - x64
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v3
+      - uses: julia-actions/setup-julia@latest
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v1
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
-      - uses: julia-actions/julia-buildpkg@v1
-      - uses: julia-actions/julia-runtest@v1
+      - uses: julia-actions/cache@v1
+      - uses: julia-actions/julia-buildpkg@latest
+      - uses: julia-actions/julia-runtest@latest
       - name: Revise tests
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: julia -e 'using Pkg; Pkg.develop(PackageSpec(path=".")); Pkg.add(PackageSpec(url="https://github.com/timholy/Revise.jl")); Pkg.test("Revise")'
+        run: |
+          julia -e '
+            using Pkg
+            Pkg.develop(path=".")
+            Pkg.add(url="https://github.com/timholy/Revise.jl")
+            Pkg.test("Revise")
+          '
       - name: Test while running Revise
         if: ${{ matrix.os == 'ubuntu-latest' && matrix.version != '1.0' }}
-        run: TERM="xterm" julia --project -i --code-coverage -e 'using InteractiveUtils, REPL, Revise, Pkg;
-                                                                 Pkg.add("ColorTypes");
-                                                                 @async(Base.run_main_repl(true, true, false, true, false));
-                                                                 sleep(2);
-                                                                 cd("test");
-                                                                 include("runtests.jl");
-                                                                 REPL.eval_user_input(:(exit()), Base.active_repl_backend)'
-      - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v1
+        run: |
+          TERM="xterm" julia --project -i --code-coverage -e '
+            using InteractiveUtils, REPL, Revise, Pkg
+            Pkg.add("ColorTypes")
+            # @async(Base.run_main_repl(true, true, false, true, false))
+            sleep(2)
+            cd("test")
+            include("runtests.jl")
+            REPL.eval_user_input(:(exit()), Base.active_repl_backend)
+          '
+      - uses: julia-actions/julia-processcoverage@latest
+      - uses: codecov/codecov-action@v3
         with:
           file: lcov.info

Project.toml

@@ -8,7 +8,7 @@ InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
-julia = "1"
+julia = "1.6"
 
 [extras]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"

src/utils.jl

@@ -117,7 +117,7 @@ function maybe_fix_path(file)
 end
 
 safe_isfile(x) = try isfile(x); catch; false end
-const BUILDBOT_STDLIB_PATH = dirname(abspath(joinpath(String((@which uuid1()).file), "..", "..", "..")))
+const BUILDBOT_STDLIB_PATH = dirname(abspath(String((@which uuid1()).file), "..", "..", ".."))
 replace_buildbot_stdlibpath(str::String) = replace(str, BUILDBOT_STDLIB_PATH => Sys.STDLIB)
 """
     path = maybe_fixup_stdlib_path(path::String)
@@ -145,33 +145,6 @@ function postpath(filename, pre)
     return post
 end
 
-if Base.VERSION < v"1.1"
-    function splitpath(p::String)
-        # splitpath became available with Julia 1.1
-        # Implementation copied from Base except doesn't handle the drive
-        out = String[]
-        isempty(p) && (pushfirst!(out,p))  # "" means the current directory.
-        while !isempty(p)
-            dir, base = _splitdir_nodrive(p)
-            dir == p && (pushfirst!(out, dir); break)  # Reached root node.
-            if !isempty(base)  # Skip trailing '/' in basename
-                pushfirst!(out, base)
-            end
-            p = dir
-        end
-        return out
-    end
-    splitpath(p::AbstractString) = splitpath(String(p))
-
-    _splitdir_nodrive(path::String) = _splitdir_nodrive("", path)
-    function _splitdir_nodrive(a::String, b::String)
-        m = match(Base.Filesystem.path_dir_splitter,b)
-        m === nothing && return (a,b)
-        a = string(a, isempty(m.captures[1]) ? m.captures[2][1] : m.captures[1])
-        a, String(m.captures[3])
-    end
-end
-
 # Robust across Julia versions
 getpkgid(project::AbstractString, libname) = getpkgid(Base.project_deps_get(project, libname), libname)
 getpkgid(id::PkgId, libname) = id

test/runtests.jl

@@ -65,17 +65,23 @@ isdefined(Main, :Revise) ? Main.Revise.includet("script.jl") : include("script.j
     @test occursin("Float32", src)
     @test line == 43
 
+    info = CodeTracking.PkgFiles(Base.PkgId(CodeTracking), nothing)
+    @test isempty(CodeTracking.basedir(info))
+
+    info = CodeTracking.PkgFiles(Base.PkgId(CodeTracking), [])
+    @test length(CodeTracking.srcfiles(info)) == 0
+
     info = CodeTracking.PkgFiles(Base.PkgId(CodeTracking))
     @test Base.PkgId(info) === info.id
     @test CodeTracking.basedir(info) == dirname(@__DIR__)
 
-    io = IOBuffer()
+    io = PipeBuffer()
     show(io, info)
-    str = String(take!(io))
+    str = read(io, String)
     @test startswith(str, "PkgFiles(CodeTracking [da1fd8a2-8d9e-5ec2-8556-3022fb5608a2]):\n  basedir:")
     ioctx = IOContext(io, :compact=>true)
     show(ioctx, info)
-    str = String(take!(io))
+    str = read(io, String)
     @test match(r"PkgFiles\(CodeTracking, .*CodeTracking(\.jl)?, Any\[\]\)", str) !== nothing
 
     @test pkgfiles("ColorTypes") === nothing
@@ -98,8 +104,9 @@ isdefined(Main, :Revise) ? Main.Revise.includet("script.jl") : include("script.j
     @test whereis(m) == ("REPL[1]", 1)
     CodeTracking.method_lookup_callback[] = oldlookup
 
+    # Test implicit replacement of `BUILDBOT_STDLIB_PATH`
     m = first(methods(Test.eval))
-    @test occursin(Sys.STDLIB, whereis(m)[1])
+    @test isfile(whereis(m)[1])
 
     # https://github.com/JuliaDebug/JuliaInterpreter.jl/issues/150
     function f150()