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

[Thomas Huth <thuth@redhat.com>]

On 20/02/2024 19.06, Daniel P. Berrangé wrote:
> On Tue, Feb 20, 2024 at 05:44:12PM +0000, 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
> 
> This var isn't needed since you remove the only usage of it.
> 
>> +    MSYSTEM: MINGW64
> 
> I'm fuzzy on whether this is needed or not ?   We don't use it,
> but perhaps it is something MSys wants set ?

We've had this in the very first version of this file already:

  - $env:MSYSTEM = 'MINGW64'     # Start a 64 bit Mingw environment

So I think this is required by MSYS.

  Thomas