[PATCH v2] ci: Upgrade msys2 release to 20220603

[PATCH v2] ci: Upgrade msys2 release to 20220603

[Yonggang Luo]

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 .cirrus.yml              | 2 +-
 .gitlab-ci.d/windows.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 20843a420c..4ffef6105b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -12,7 +12,7 @@ windows_msys2_task:
     CIRRUS_SHELL: powershell
     MSYS: winsymlinks:nativestrict
     MSYSTEM: MINGW64
-    MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2022-05-03/msys2-base-x86_64-20220503.sfx.exe
+    MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2022-06-03/msys2-base-x86_64-20220603.sfx.exe
     MSYS2_FINGERPRINT: 0
     MSYS2_PACKAGES: "
       diffutils git grep make pkg-config sed
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index 1b2ede49e1..da80fabe2c 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -17,7 +17,7 @@
     }
   - If ( !(Test-Path -Path msys64\var\cache\msys2.exe ) ) {
       Invoke-WebRequest
-      "https://github.com/msys2/msys2-installer/releases/download/2022-05-03/msys2-base-x86_64-20220503.sfx.exe"
+      "https://github.com/msys2/msys2-installer/releases/download/2022-06-03/msys2-base-x86_64-20220603.sfx.exe"
       -outfile "msys64\var\cache\msys2.exe"
     }
   - msys64\var\cache\msys2.exe -y
-- 
2.36.1.windows.1

Re: [PATCH v2] ci: Upgrade msys2 release to 20220603

[罗勇刚(Yonggang Luo)]

[-- Attachment #1: Type: text/plain, Size: 1809 bytes --]

Seems this fixes the gitlab ci
I've running multiple times
https://gitlab.com/lygstate/qemu/-/jobs/2785244516
https://gitlab.com/lygstate/qemu/-/jobs/2785245299
all succeed.

On Fri, Jul 29, 2022 at 4:04 AM Yonggang Luo <luoyonggang@gmail.com> wrote:
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  .cirrus.yml              | 2 +-
>  .gitlab-ci.d/windows.yml | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 20843a420c..4ffef6105b 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -12,7 +12,7 @@ windows_msys2_task:
>      CIRRUS_SHELL: powershell
>      MSYS: winsymlinks:nativestrict
>      MSYSTEM: MINGW64
> -    MSYS2_URL:
https://github.com/msys2/msys2-installer/releases/download/2022-05-03/msys2-base-x86_64-20220503.sfx.exe
> +    MSYS2_URL:
https://github.com/msys2/msys2-installer/releases/download/2022-06-03/msys2-base-x86_64-20220603.sfx.exe
>      MSYS2_FINGERPRINT: 0
>      MSYS2_PACKAGES: "
>        diffutils git grep make pkg-config sed
> diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
> index 1b2ede49e1..da80fabe2c 100644
> --- a/.gitlab-ci.d/windows.yml
> +++ b/.gitlab-ci.d/windows.yml
> @@ -17,7 +17,7 @@
>      }
>    - If ( !(Test-Path -Path msys64\var\cache\msys2.exe ) ) {
>        Invoke-WebRequest
> -      "
https://github.com/msys2/msys2-installer/releases/download/2022-05-03/msys2-base-x86_64-20220503.sfx.exe
"
> +      "
https://github.com/msys2/msys2-installer/releases/download/2022-06-03/msys2-base-x86_64-20220603.sfx.exe
"
>        -outfile "msys64\var\cache\msys2.exe"
>      }
>    - msys64\var\cache\msys2.exe -y
> --
> 2.36.1.windows.1
>


--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[-- Attachment #2: Type: text/html, Size: 2880 bytes --]

Re: [PATCH v2] ci: Upgrade msys2 release to 20220603

[Bin Meng]

On Fri, Jul 29, 2022 at 4:04 AM Yonggang Luo <luoyonggang@gmail.com> wrote:
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  .cirrus.yml              | 2 +-
>  .gitlab-ci.d/windows.yml | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Re: [PATCH v2] ci: Upgrade msys2 release to 20220603

[Alex Bennée]

Yonggang Luo <luoyonggang@gmail.com> writes:

> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  .cirrus.yml              | 2 +-
>  .gitlab-ci.d/windows.yml | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Queued to testing/next, thanks.


-- 
Alex Bennée

Re: [PATCH v2] ci: Upgrade msys2 release to 20220603

[Richard Henderson]

On 7/28/22 13:04, Yonggang Luo wrote:
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>   .cirrus.yml              | 2 +-
>   .gitlab-ci.d/windows.yml | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)

Thanks.  Applied to master as a hot-fix.


r~

Re: [PATCH v2] ci: Upgrade msys2 release to 20220603

[罗勇刚(Yonggang Luo)]

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

I have reason to think that's msys2-64 bit failed because out of memory

I tried to show the memory size of the windows docker, it's result
are 6224352KB, that's less than 6GB?
https://gitlab.com/lygstate/qemu/-/jobs/2891399652

Can we increase the memory size to 16GB


On Sat, Jul 30, 2022 at 3:24 AM Richard Henderson <
richard.henderson@linaro.org> wrote:
>
> On 7/28/22 13:04, Yonggang Luo wrote:
> > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> > ---
> >   .cirrus.yml              | 2 +-
> >   .gitlab-ci.d/windows.yml | 2 +-
> >   2 files changed, 2 insertions(+), 2 deletions(-)
>
> Thanks.  Applied to master as a hot-fix.
>
>
> r~



--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[-- Attachment #2: Type: text/html, Size: 1134 bytes --]

Re: [PATCH v2] ci: Upgrade msys2 release to 20220603

[Thomas Huth]

On 16/08/2022 20.53, 罗勇刚(Yonggang Luo) wrote:
> I have reason to think that's msys2-64 bit failed because out of memory
> 
> I tried to show the memory size of the windows docker, it's result 
> are 6224352KB, that's less than 6GB?
> https://gitlab.com/lygstate/qemu/-/jobs/2891399652 
> <https://gitlab.com/lygstate/qemu/-/jobs/2891399652>
> 
> Can we increase the memory size to 16GB

I'm not aware of any way to increase the memory size for gitlab jobs ... 
Daniel, Alex, do you maybe know?

  Thomas

Re: [PATCH v2] ci: Upgrade msys2 release to 20220603

[Daniel P. Berrangé]

On Fri, Aug 19, 2022 at 09:50:20AM +0200, Thomas Huth wrote:
> On 16/08/2022 20.53, 罗勇刚(Yonggang Luo) wrote:
> > I have reason to think that's msys2-64 bit failed because out of memory
> > 
> > I tried to show the memory size of the windows docker, it's result
> > are 6224352KB, that's less than 6GB?
> > https://gitlab.com/lygstate/qemu/-/jobs/2891399652
> > <https://gitlab.com/lygstate/qemu/-/jobs/2891399652>
> > 
> > Can we increase the memory size to 16GB
> 
> I'm not aware of any way to increase the memory size for gitlab jobs ...
> Daniel, Alex, do you maybe know?

I don't bvelieve there's any option

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v2] ci: Upgrade msys2 release to 20220603

[罗勇刚(Yonggang Luo)]

[-- Attachment #1: Type: text/plain, Size: 1191 bytes --]

After digging, it seems to be a memory issue, cirrus also uses 8gb, that's
rather weird...

On Mon, Aug 22, 2022 at 6:02 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:
>
> On Fri, Aug 19, 2022 at 09:50:20AM +0200, Thomas Huth wrote:
> > On 16/08/2022 20.53, 罗勇刚(Yonggang Luo) wrote:
> > > I have reason to think that's msys2-64 bit failed because out of
memory
> > >
> > > I tried to show the memory size of the windows docker, it's result
> > > are 6224352KB, that's less than 6GB?
> > > https://gitlab.com/lygstate/qemu/-/jobs/2891399652
> > > <https://gitlab.com/lygstate/qemu/-/jobs/2891399652>
> > >
> > > Can we increase the memory size to 16GB
> >
> > I'm not aware of any way to increase the memory size for gitlab jobs ...
> > Daniel, Alex, do you maybe know?
>
> I don't bvelieve there's any option
>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-
https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-
https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-
https://www.instagram.com/dberrange :|
>


--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[-- Attachment #2: Type: text/html, Size: 1920 bytes --]

Re: [PATCH v2] ci: Upgrade msys2 release to 20220603

[Thomas Huth]

On 22/08/2022 16.39, 罗勇刚(Yonggang Luo) wrote:
> After digging, it seems to be a memory issue, cirrus also uses 8gb, that's 
> rather weird...

If it's a memory issue, it might help to remove the "-j2" from the 
invocation of "make", so that only one file is compiled at once...?

  Thomas