Support for Julia 1.6.

JuliaCI · Apr 14, 2021 · cb8810b · cb8810b
1 parent d98c456
commit cb8810b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,6 +15,7 @@ jobs:
           - '1.3'
           - '1.4'
           - '1.5'
+          - '1.6'
         os:
           - ubuntu-latest
         arch:
@@ -25,7 +26,7 @@ jobs:
           - 8cb458c6dcd8e067a3bd430b006efb0dfde56cf9 # directly from Git, never built
           - master                                   # directly from Git, likely built
     env:
-      JULIA_DEBUG: NewPkgEval
+      JULIA_DEBUG: PkgEval
       JULIA_VERSION: ${{ matrix.build_version }}
     steps:
       - uses: actions/checkout@v2

diff --git a/Project.toml b/Project.toml
@@ -19,7 +19,7 @@ SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 
 [compat]
-BinaryBuilder = "0.2.1"
+BinaryBuilder = "0.2.1, 0.3"
 DataFrames = "0.19, 0.20, 0.21"
 Downloads = "1.0"
 julia = "1.3"

diff --git a/deps/Versions.toml b/deps/Versions.toml
@@ -41,3 +41,11 @@ url = "https://julialang-s3.julialang.org/bin/linux/x64/1.5/julia-1.5.2-linux-x8
 ["1.5.3"]
 sha = "f190c938dd6fed97021953240523c9db448ec0a6760b574afd4e9924ab5615f1"
 url = "https://julialang-s3.julialang.org/bin/linux/x64/1.5/julia-1.5.3-linux-x86_64.tar.gz"
+
+["1.5.4"]
+sha = "80dec351d1a593e8ad152636971a48d0c81bfcfab92c87f3604663616f1e8bc5"
+url = "https://julialang-s3.julialang.org/bin/linux/x64/1.5/julia-1.5.4-linux-x86_64.tar.gz"
+
+["1.6.0"]
+sha = "463b71dc70ca7094c0e0fd6d55d130051a7901e8dec5eb44d6002c57d1bd8585"
+url = "https://julialang-s3.julialang.org/bin/linux/x64/1.6/julia-1.6.0-linux-x86_64.tar.gz"
diff --git a/src/run.jl b/src/run.jl
@@ -532,11 +532,17 @@ function run(julia_versions::Vector{VersionNumber}, pkgs::Vector;
                             ctx = Pkg.Types.Context()
                             pkg_version_info = Pkg.Operations.load_versions(ctx, job.pkg.path)
                             pkg_versions = sort!(collect(keys(pkg_version_info)))
-                            pkg_compat =
+                            pkg_compat = VERSION >= v"1.6"
+                                Pkg.Operations.load_package_data(ctx, Pkg.Types.VersionSpec,
+                                                                 joinpath(job.pkg.path,
+                                                                          "Compat.toml"),
+                                                                 pkg_versions)
+                            else
                                 Pkg.Operations.load_package_data(Pkg.Types.VersionSpec,
                                                                  joinpath(job.pkg.path,
                                                                           "Compat.toml"),
                                                                  pkg_versions)
+                            end
                             for (pkg_version, bounds) in pkg_compat
                                 if haskey(bounds, "julia")
                                     julia_supported[pkg_version] =