Skip to content

Commit

Permalink
Merge pull request #11 from JuliaPluto/julia-1.10-lts
Browse files Browse the repository at this point in the history
  • Loading branch information
fonsp authored Oct 21, 2024
2 parents b998a9c + 65d31a2 commit 1f9fd41
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/IntegrationTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.julia-version }}
arch: x64
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ jobs:
# Without setting this, a failing test cancels all others
fail-fast: false
matrix:
julia-version: ["1.6", "1", "~1.11.0-0", "nightly"]
julia-version: ["1.10", "1", "nightly"] # "~1.12.0-0"]
os: [ubuntu-latest]

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4

# Makes thes `julia` command available
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.julia-version }}
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2

# 🚗
- uses: julia-actions/julia-runtest@v1
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name = "PlutoDependencyExplorer"
uuid = "72656b73-756c-7461-726b-72656b6b696b"
license = "MIT"
authors = ["Paul Berg <[email protected]>", "Fons van der Plas <[email protected]>"]
version = "1.0.4"
version = "1.0.5"

[deps]
ExpressionExplorer = "21656369-7473-754a-2065-74616d696c43"
Expand All @@ -13,4 +13,4 @@ Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
ExpressionExplorer = "0.6, 1"
InteractiveUtils = "1"
Markdown = "1"
julia = "1.6"
julia = "1.10"
1 change: 1 addition & 0 deletions test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Pluto = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
PlutoDependencyExplorer = "72656b73-756c-7461-726b-72656b6b696b"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
4 changes: 2 additions & 2 deletions test/pluto integration/helpers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function expecterror(err, cell; strict=true)
msg = sprint(showerror, err)

# UndefVarError(:x, #undef)
if err isa UndefVarError && !isdefined(err, :scope) && VERSION > v"1.10"
if err isa UndefVarError && !isdefined(err, :scope) && VERSION >= v"1.11"
strict = false
msg = first(split(msg, '\n'; limit=2))
end
Expand All @@ -41,4 +41,4 @@ function expecterror(err, cell; strict=true)
else
return occursin(msg, cell.output.body[:msg])
end
end
end

0 comments on commit 1f9fd41

Please sign in to comment.