Re: [PATCH 3/3] .gitlab-ci.d/windows.yml: Remove shared-msys2 abstraction

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

On 20/2/24 18:44, Peter Maydell wrote:
> Now we don't build msys2-32bit we don't need the abstraction out of the
> common msys2 handling from the 32-vs-64-bit specifics. Collapse it
> down into the msys2-64bit job definition.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   .gitlab-ci.d/windows.yml | 84 +++++++++++++++++++---------------------
>   1 file changed, 40 insertions(+), 44 deletions(-)
> 
> diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
> index 8fc08218d28..e784d5a68cd 100644
> --- a/.gitlab-ci.d/windows.yml
> +++ b/.gitlab-ci.d/windows.yml
> @@ -1,4 +1,4 @@
> -.shared_msys2_builder:
> +msys2-64bit:
>     extends: .base_job_template
>     tags:
>     - shared-windows
> @@ -14,9 +14,19 @@
>     stage: build
>     timeout: 100m
>     variables:
> +    MINGW_TARGET: mingw-w64-x86_64

You expanded $MINGW_TARGET so we can remove it.

> +    MSYSTEM: MINGW64
>       # This feature doesn't (currently) work with PowerShell, it stops
>       # the echo'ing of commands being run and doesn't show any timing
>       FF_SCRIPT_SECTIONS: 0
> +    # do not remove "--without-default-devices"!
> +    # 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 64-bit job, due to the build could not complete within

s/the msys2 64-bit/this/, although it seems this sentence got truncated.

> +    CONFIGURE_ARGS:  --target-list=x86_64-softmmu --without-default-devices -Ddebug=false -Doptimization=0
> +    # qTests don't run successfully with "--without-default-devices",
> +    # so let's exclude the qtests from CI for now.
> +    TEST_ARGS: --no-suite qtest
>     artifacts:
>       name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
>       expire_in: 7 days

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>