Skip to content

Commit

Permalink
update stable
Browse files Browse the repository at this point in the history
  • Loading branch information
t-bltg committed Dec 25, 2023
1 parent ca9d075 commit 6c4a87e
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
matrix:
version:
- '1.6' # LTS (lowest supported `julia` version declared in `Project.toml`)
- '1.8' # latest stable
- '1' # latest stable
os: [ubuntu-latest, windows-latest, macos-latest]
arch: [x64, x86]
exclude:
Expand Down
10 changes: 5 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[compat]
ColorSchemes = " 3.19"
ColorSchemes = "≥3.19"
Colors = "0.12"
Dates = "1"
Printf = "1"
Random = "1"
Dates = "0.0.0, 1"
Printf = "0.0.0, 1"
Random = "0.0.0, 1"
Reexport = "1"
PrecompileTools = "1"
Statistics = "1"
Statistics = "0.0.0, 1"
julia = "1.6"

[extras]
Expand Down
43 changes: 19 additions & 24 deletions test/downstream.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ using Pkg, PlotUtils, Test
LibGit2 = Pkg.GitTools.LibGit2
TOML = Pkg.TOML

failsafe_clone_checkout(versions, path, url) = begin
failsafe_clone_checkout(path, url) = begin
local repo
for i 1:6
try
Expand All @@ -16,6 +16,18 @@ failsafe_clone_checkout(versions, path, url) = begin
end

@assert isfile(joinpath(path, "Project.toml")) "spurious network error: clone failed, bailing out"

name, _ = splitext(basename(url))
registries = joinpath(first(DEPOT_PATH), "registries")
general = joinpath(registries, "General")
versions = joinpath(general, name[1:1], name, "Versions.toml")
if !isfile(versions)
mkpath(general)
run(setenv(`tar xf $general.tar.gz`; dir = general))
readdir(general) |> println
end
@assert isfile(versions)

stable = maximum(VersionNumber.(keys(TOML.parse(read(versions, String)))))
tag = LibGit2.GitObject(repo, "v$stable")
hash = string(LibGit2.target(tag))
Expand All @@ -39,17 +51,8 @@ end
deploy_Plots() = begin
tmpd = mktempdir()
Plots_jl = joinpath(tmpd, "Plots.jl")
Plots_toml = joinpath(Plots_jl, "Project.toml")
versions = joinpath(
first(DEPOT_PATH),
"registries",
"General",
"P",
"Plots",
"Versions.toml",
)

failsafe_clone_checkout(versions, Plots_jl, "https://github.com/JuliaPlots/Plots.jl")

failsafe_clone_checkout(Plots_jl, "https://github.com/JuliaPlots/Plots.jl")
fake_supported_version!(Plots_jl)

Pkg.develop(path = Plots_jl)
Expand All @@ -60,24 +63,16 @@ end
deploy_Makie(extended = false) = begin
tmpd = mktempdir()
Makie_jl = joinpath(tmpd, "Makie.jl")
versions = joinpath(
first(DEPOT_PATH),
"registries",
"General",
"M",
"Makie",
"Versions.toml",
)

failsafe_clone_checkout(versions, Makie_jl, "https://github.com/MakieOrg/Makie.jl")

failsafe_clone_checkout(Makie_jl, "https://github.com/MakieOrg/Makie.jl")
fake_supported_version!(Makie_jl)

Pkg.develop(path = joinpath(tmpd, "Makie.jl", "MakieCore"))
Pkg.develop(path = joinpath(tmpd, "Makie.jl"))
if extended # too costly ?
Pkg.develop(path = joinpath(tmpd, "Makie.jl", "ReferenceTests"))
Pkg.develop(path = joinpath(tmpd, "Makie.jl", "CairoMakie"))
Pkg.develop(path = joinpath(tmpd, "Makie.jl", "GLMakie"))
# Pkg.develop(path = joinpath(tmpd, "Makie.jl", "GLMakie"))
end
Pkg.status(["PlotUtils", "MakieCore", "Makie"])
nothing
Expand All @@ -100,5 +95,5 @@ extended = tryparse(Bool, get(ENV, "CI", "false")) === false # extended test lo
deploy_Makie(extended)
@testset "downstream Makie" begin
Pkg.test("Makie")
extended && Pkg.test(["CairoMakie", "GLMakie"])
extended && Pkg.test("CairoMakie")
end

0 comments on commit 6c4a87e

Please sign in to comment.