diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eabd9d9..0c942af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: tags: '*' jobs: test: - name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} + name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}${{ matrix.juliasyntaxvendored && ' - julia vendored JuliaSyntax' || '' }} - ${{ github.event_name }} runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -22,6 +22,8 @@ jobs: - ubuntu-latest arch: - x64 + juliasyntaxvendored: + - false include: - version: '1' os: ubuntu-latest @@ -35,12 +37,19 @@ jobs: - version: '1' os: macos-latest arch: x64 + - version: '1' + os: ubuntu-latest + arch: x64 + juliasyntaxvendored: true steps: - uses: actions/checkout@v6 - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} + - name: Use JuliaSyntax from julia master + if: matrix.juliasyntaxvendored + run: julia --project -e 'using Pkg; Pkg.add(url="https://github.com/JuliaLang/julia.git", subdir="JuliaSyntax")' - uses: julia-actions/julia-buildpkg@v1 - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1 diff --git a/Project.toml b/Project.toml index b54aaca..347edd9 100644 --- a/Project.toml +++ b/Project.toml @@ -8,7 +8,7 @@ JuliaSyntax = "70703baa-626e-46a2-a12c-08ffd08c73b4" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" [compat] -JuliaSyntax = "1" +JuliaSyntax = "1,2" TOML = "1" julia = "1.10"