ci: bump to windows 2022

Skip failing funcitonaltests. Use jobstart() instead termopen() for
oldtests to prevent CI freezing.
This commit is contained in:
dundargoc 2023-03-11 22:56:16 +01:00 committed by GitHub
parent 829d92eca3
commit 9d574f8dd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 9 deletions

View File

@ -288,7 +288,7 @@ jobs:
run: cmake --build build --config MinSizeRel
windows:
runs-on: windows-2019
runs-on: windows-2022
timeout-minutes: 45
name: windows
steps:
@ -347,15 +347,20 @@ jobs:
timeout-minutes: 20
run: cmake --build build --target functionaltest
- if: success() || failure() && steps.abort_job.outputs.status == 'success'
uses: msys2/setup-msys2@v2
with:
update: true
pacboy: >-
make:p gcc:p
release: false
- if: success() || failure() && steps.abort_job.outputs.status == 'success'
name: Run oldtest
shell: msys2 {0}
run: |
# Add MSYS to path, required for e.g. `find` used in test scripts.
# But would break functionaltest, where its `more` would be used then.
$OldPath = $env:PATH
$env:PATH = "C:\msys64\usr\bin;$env:PATH"
& "C:\msys64\mingw64\bin\mingw32-make.exe" -C $(Convert-Path test\old\testdir) VERBOSE=1
$env:PATH = $OldPath
cd test/old/testdir
mingw32-make VERBOSE=1
with-external-deps:
runs-on: ubuntu-22.04

View File

@ -50,6 +50,7 @@ describe('autocmd TermClose', function()
end)
it('triggers when long-running terminal job gets stopped', function()
skip(is_os('win'))
nvim('set_option', 'shell', is_os('win') and 'cmd.exe' or 'sh')
command('autocmd TermClose * let g:test_termclose = 23')
command('terminal')

View File

@ -18,6 +18,8 @@ local is_os = helpers.is_os
local file_prefix = 'Xtest-functional-ex_cmds-mksession_spec'
if helpers.skip(helpers.is_os('win')) then return end
describe(':mksession', function()
local session_file = file_prefix .. '.vim'
local tab_dir = file_prefix .. '.d'

View File

@ -54,6 +54,7 @@ describe("shell command :!", function()
it("throttles shell-command output greater than ~10KB", function()
skip(is_os('openbsd'), 'FIXME #10804')
skip(is_os('win'))
child_session.feed_data((":!%s REP 30001 foo\n"):format(testprg('shell-test')))
-- If we observe any line starting with a dot, then throttling occurred.

View File

@ -23,11 +23,13 @@ function Main()
set lines=25
set columns=80
enew
let job = termopen(args, s:logger)
" FIXME: using termopen() hangs on Windows CI
let job = has('win32') ? jobstart(args, s:logger) : termopen(args, s:logger)
let results = jobwait([job], 5 * 60 * 1000)
" TODO(ZyX-I): Get colors
let screen = getline(1, '$')
bwipeout! " kills the job always.
call jobstop(job) " kills the job always.
bwipeout!
let stringified_events = map(s:logger.d_events,
\'v:val[0] . ": " . ' .
\'join(map(v:val[1], '.