Skip to content

Commit

Permalink
Merge branch 'main' into tests-from-pluto
Browse files Browse the repository at this point in the history
  • Loading branch information
fonsp committed Jan 30, 2024
2 parents e7c1aa5 + f9a1ed0 commit 62003f6
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 1 deletion.
40 changes: 40 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Julia tests

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the main branch
on:
workflow_dispatch:
push:
paths-ignore:
- '**.md'
branches:
- main
pull_request:
paths-ignore:
- '**.md'

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
test:
runs-on: ${{ matrix.os }}
timeout-minutes: 10

strategy:
# Without setting this, a failing test cancels all others
fail-fast: false
matrix:
julia-version: ['1.6', '1.10', 'nightly'] # "~1.11.0-0",
os: [ubuntu-latest]

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

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

# 🚗
- uses: julia-actions/julia-runtest@v1
7 changes: 6 additions & 1 deletion src/ExpressionExplorer.jl
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,12 @@ function maybe_macroexpand_pluto(ex::Expr; recursive::Bool=false, expand_bind::B
funcname = ExpressionExplorer.split_funcname(ex.args[1])

if funcname.joined (expand_bind ? can_macroexpand : can_macroexpand_no_bind)
macroexpand(get_plutorunner(), ex; recursive=false)::Expr
try
macroexpand(get_plutorunner(), ex; recursive=false)::Expr
catch e
@debug "Could not macroexpand" ex exception=(e, catch_backtrace())
ex
end
else
ex
end
Expand Down

0 comments on commit 62003f6

Please sign in to comment.