Skip to content

Commit 3ea92f4

Browse files
authored
Merge pull request #391 from julia-vscode/sp/macos-tests
chore: reintroduce macos tests
2 parents 39528bb + d2fdc91 commit 3ea92f4

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

.github/workflows/jlpkgbutler-ci-master-workflow.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ jobs:
1313
strategy:
1414
matrix:
1515
julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '1.10', '1.11']
16-
os: [ubuntu-latest, windows-latest]
16+
os: [ubuntu-latest, windows-latest, macos-13]
17+
exclude:
18+
- os: macos-13
19+
- julia-version: 1.4
1720
steps:
1821
- uses: actions/checkout@v4
1922
- uses: julia-actions/install-juliaup@v1

.github/workflows/jlpkgbutler-ci-pr-workflow.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ jobs:
1010
strategy:
1111
matrix:
1212
julia-version: ['1.0', '1.1', '1.2', '1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', '1.10', '1.11']
13-
os: [ubuntu-latest, windows-latest]
13+
os: [ubuntu-latest, windows-latest, macos-13]
14+
exclude:
15+
- os: macos-13
16+
- julia-version: 1.4
1417

1518
steps:
1619
- uses: actions/checkout@v4

test/test_check_base.jl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,16 @@
135135
file = joinpath(root, fpath)
136136
endswith(file, ".jl") || continue
137137

138+
# filter out irrelevant files, like e.g. ._julia-config.jl in the macos tarballs
139+
startswith(file, ".") && continue
140+
startswith(file, "_") && continue
141+
138142
str = read(file, String)
139143

144+
isvalid(str) || continue
145+
146+
@info "parsing $file"
147+
140148
cst = CSTParser.parse(str, true)
141149
cst_expr, cst_err, span_err = cst_parse_file(str)
142150
meta_expr, meta_err = meta_parse_file(str)

test/test_errparse.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using CSTParser: to_codeobject
66
using Tokenize: tokenize
77
import Tokenize.Tokens: untokenize
8-
8+
99
function trav(x, f=x -> nothing)
1010
f(x)
1111
for a in x

0 commit comments

Comments
 (0)