Skip to content

Commit 3dccd2a

Browse files
authored
Fix test suite for Julia >= 1.12; tweak CI setup (#11)
* Fix test suite for Julia >= 1.12 * CI: don't run macOS tests on ARM with Intel Julia * Test against LTS, drop some 1.6 tests
1 parent 65049e2 commit 3dccd2a

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/CI.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,22 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
version:
26-
- '1.6'
26+
- 'lts'
2727
- '1'
2828
- 'nightly'
2929
os:
3030
- ubuntu-latest
3131
- macos-latest
3232
- windows-latest
3333
arch:
34-
- x64
34+
- default
3535
include:
3636
- version: '1'
3737
os: ubuntu-latest
3838
arch: x86
39+
- version: '1.6'
40+
os: ubuntu-latest
41+
arch: x64
3942
- version: '1.7'
4043
os: ubuntu-latest
4144
arch: x64

test/parseblock.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ end
4343

4444
let expr = exprs[3]
4545
@test expr.expr === :γγγ
46-
if VERSION >= v"1.10.0-DEV.1520" # JuliaSyntax merge
46+
if VERSION >= v"1.10.0-DEV.1520" && # JuliaSyntax merge
47+
VERSION < v"1.12" # bug fix
4748
@test expr.code == "γγγ\n\n"
4849
else
4950
@test expr.code == "γγγ\n"
@@ -61,7 +62,8 @@ end
6162
l1, l2 = parse("x = Int[]$(LE)$(LE)push!(x, 1)$(LE)")
6263
@test l1.expr == :(x = Int[])
6364
@test l2.expr == :(push!(x, 1))
64-
if VERSION >= v"1.10.0-DEV.1520" # JuliaSyntax merge
65+
if VERSION >= v"1.10.0-DEV.1520" && # JuliaSyntax merge
66+
VERSION < v"1.12" # bug fix
6567
@test l1.code == "x = Int[]$(LE)$(LE)"
6668
@test l2.code == "push!(x, 1)$(LE)\n"
6769
else
@@ -84,7 +86,7 @@ end
8486
@test exprs[1].code == "x; y; z\n"
8587
@test exprs[2].expr == :q
8688
# TODO: There is a parsing difference here.. probably due to the JuliaSyntax change.
87-
if VERSION < v"1.10"
89+
if VERSION < v"1.10" || VERSION >= v"1.12"
8890
@test exprs[2].code == "q\n"
8991
else
9092
@test exprs[2].code == "q\n\n\n"

0 commit comments

Comments
 (0)