Hi On Thu, Oct 6, 2022 at 8:16 PM Bin Meng <bmeng...@gmail.com> wrote:
> From: Bin Meng <bin.m...@windriver.com> > > commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using > --without-default-devices" > changed to compile QEMU with the --without-default-devices switch for > the msys2-64bit job, due to the build could not complete within the > project timeout (1h), and also mentioned that a bigger timeout was > getting ignored on the shared Gitlab-CI Windows runners. > > However as of today it seems the shared Gitlab-CI Windows runners does > honor the job timeout, and the runner has the timeout limit of 2h, so > let's increase the timeout to 90 minutes and drop the configure switch > "--without-default-devices" to get a larger build coverage. > > Signed-off-by: Bin Meng <bin.m...@windriver.com> > Given the discussion in "[PATCH v2 36/39] .gitlab-ci.d/windows.yml: Increase the timeout to 90 minutes", maybe we should drop this patch for now? --- > > (no changes since v2) > > Changes in v2: > - Change the timeout limit to 90 minutes > > .gitlab-ci.d/windows.yml | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml > index a3e7a37022..093276ddbc 100644 > --- a/.gitlab-ci.d/windows.yml > +++ b/.gitlab-ci.d/windows.yml > @@ -10,7 +10,7 @@ > - ${CI_PROJECT_DIR}/msys64/var/cache > needs: [] > stage: build > - timeout: 70m > + timeout: 90m > before_script: > - If ( !(Test-Path -Path msys64\var\cache ) ) { > mkdir msys64\var\cache > @@ -60,7 +60,7 @@ msys2-64bit: > - $env:MSYSTEM = 'MINGW64' # Start a 64 bit Mingw environment > - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink > - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu > - --enable-capstone --without-default-devices' > + --enable-capstone' > - .\msys64\usr\bin\bash -lc 'make' > - .\msys64\usr\bin\bash -lc 'make check || { cat > build/meson-logs/testlog.txt; exit 1; } ;' > > -- > 2.34.1 > > > -- Marc-André Lureau