diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 31bc8513..a74a8f98 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -4,7 +4,7 @@ on: push: branches: - master - tags: '*' + jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} @@ -13,30 +13,30 @@ jobs: fail-fast: false matrix: include: - # - version: '1' # current stable - # os: ubuntu-latest - # arch: x64 - - version: '1.12-nightly' # lowest version supported + - version: '1' # current stable + os: ubuntu-latest + arch: x64 + - version: '1.12' # lowest version supported os: ubuntu-latest arch: x64 - version: '1.13-nightly' # next release os: ubuntu-latest arch: x64 - # - version: 'nightly' # dev - # os: ubuntu-latest - # arch: x64 - # - version: '1' # x86 ubuntu - # os: ubuntu-latest - # arch: x86 - # - version: '1' # x86 windows - # os: windows-latest - # arch: x86 - # - version: '1' # x64 windows - # os: windows-latest - # arch: x64 - # - version: '1' # x64 macOS - # os: macos-latest - # arch: x64 + - version: 'nightly' # dev + os: ubuntu-latest + arch: x64 + - version: '1' # x86 ubuntu + os: ubuntu-latest + arch: x86 + - version: '1' # x86 windows + os: windows-latest + arch: x86 + - version: '1' # x64 windows + os: windows-latest + arch: x64 + - version: '1' # x64 macOS + os: macos-latest + arch: x64 steps: - uses: actions/checkout@v6 - uses: julia-actions/setup-julia@v2 diff --git a/.github/workflows/TypedSyntaxCI.yml b/.github/workflows/TypedSyntaxCI.yml index 8900c4f6..e8d97899 100644 --- a/.github/workflows/TypedSyntaxCI.yml +++ b/.github/workflows/TypedSyntaxCI.yml @@ -4,7 +4,7 @@ on: push: branches: - master - tags: '*' + jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} @@ -15,7 +15,7 @@ jobs: version: # - '1' # - '1.12.0' - - '1.12-nightly' + - '1.12' - 'nightly' os: - ubuntu-latest diff --git a/test/test_terminal.jl b/test/test_terminal.jl index 68c617b2..cdd10bf4 100644 --- a/test/test_terminal.jl +++ b/test/test_terminal.jl @@ -163,7 +163,7 @@ end # Native code view write(terminal, 'N') displayed, text = read_next(harness) - @test occursin("retq", text) + @test occursin(r"\bret[lq]?\b", text) # retq on x86-64, retl on x86, ret on ARM64 @test occursin('[' * colorize(true, 'N') * "]ative", displayed) # Typed view (by selector) write(terminal, 'T') @@ -209,12 +209,12 @@ end @test occursin("\nBody", text) @test occursin("\e[1m::Union{Float32, $Int}\e[22m\e[39m", displayed) @test occursin("Base.getindex(c)\e[91m\e[1m::Any\e[22m\e[39m", displayed) - warncolor = if Cthulhu.is_expected_union(Union{Float32, Int64}) + warncolor = if Cthulhu.is_expected_union(Union{Float32, Int}) Base.text_colors[Base.warn_color()] else Base.text_colors[Base.error_color()] end - @test occursin("$(warncolor)%\e[39m3 = call → fmulti(::Any)::Union{Float32, Int64}", displayed) + @test occursin("$(warncolor)%\e[39m3 = call → fmulti(::Any)::Union{Float32, $Int}", displayed) write(terminal, :down) write(terminal, :enter) displayed, text = read_next(harness)