diff mbox series

[v2,29/30] cirrus.yml: Fix the MSYS2 task

Message ID 20210504100223.25427-30-alex.bennee@linaro.org (mailing list archive)
State New, archived
Headers show
Series testing/next (hexagon, tricore, ppc, signals, cirrus) | expand

Commit Message

Alex Bennée May 4, 2021, 10:02 a.m. UTC
From: Thomas Huth <thuth@redhat.com>

The MSYS2 task in the Cirrus-CI is currently failing with error messages
like this:

 warning: database file for 'ucrt64' does not exist (use '-Sy' to download)
 :: Starting core system upgrade...
  there is nothing to do
 :: Starting full system upgrade...
 error: failed to prepare transaction (could not find database)

Seems like it can be fixed by switching to a newer release and by refreshing
the database one more time after changing the /etc/pacman.conf file.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210427185524.281883-1-thuth@redhat.com>
---
 .cirrus.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé May 12, 2021, 4:49 a.m. UTC | #1
Hi Yonggang Luo,

Does this look OK to you?

On 5/4/21 12:02 PM, Alex Bennée wrote:
> From: Thomas Huth <thuth@redhat.com>
> 
> The MSYS2 task in the Cirrus-CI is currently failing with error messages
> like this:
> 
>  warning: database file for 'ucrt64' does not exist (use '-Sy' to download)
>  :: Starting core system upgrade...
>   there is nothing to do
>  :: Starting full system upgrade...
>  error: failed to prepare transaction (could not find database)
> 
> Seems like it can be fixed by switching to a newer release and by refreshing
> the database one more time after changing the /etc/pacman.conf file.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Message-Id: <20210427185524.281883-1-thuth@redhat.com>
> ---
>  .cirrus.yml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/.cirrus.yml b/.cirrus.yml
> index f53c519447..f4bf49b704 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -67,7 +67,7 @@ windows_msys2_task:
>      CIRRUS_SHELL: powershell
>      MSYS: winsymlinks:nativestrict
>      MSYSTEM: MINGW64
> -    MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-01-05/msys2-base-x86_64-20210105.sfx.exe
> +    MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-04-19/msys2-base-x86_64-20210419.sfx.exe
>      MSYS2_FINGERPRINT: 0
>      MSYS2_PACKAGES: "
>        diffutils git grep make pkg-config sed
> @@ -130,7 +130,7 @@ windows_msys2_task:
>          taskkill /F /FI "MODULES eq msys-2.0.dll"
>          tasklist
>          C:\tools\msys64\usr\bin\bash.exe -lc "mv -f /etc/pacman.conf.pacnew /etc/pacman.conf || true"
> -        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Suu --overwrite=*"
> +        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syuu --overwrite=*"
>          Write-Output "Core install time taken: $((Get-Date).Subtract($start_time))"
>          $start_time = Get-Date
>  
>
罗勇刚(Yonggang Luo) May 12, 2021, 4:53 a.m. UTC | #2
LGTM, Thanks, forget to update this

On Wed, May 12, 2021 at 12:49 PM Philippe Mathieu-Daudé <f4bug@amsat.org>
wrote:

> Hi Yonggang Luo,
>
> Does this look OK to you?
>
> On 5/4/21 12:02 PM, Alex Bennée wrote:
> > From: Thomas Huth <thuth@redhat.com>
> >
> > The MSYS2 task in the Cirrus-CI is currently failing with error messages
> > like this:
> >
> >  warning: database file for 'ucrt64' does not exist (use '-Sy' to
> download)
> >  :: Starting core system upgrade...
> >   there is nothing to do
> >  :: Starting full system upgrade...
> >  error: failed to prepare transaction (could not find database)
> >
> > Seems like it can be fixed by switching to a newer release and by
> refreshing
> > the database one more time after changing the /etc/pacman.conf file.
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> > Message-Id: <20210427185524.281883-1-thuth@redhat.com>
> > ---
> >  .cirrus.yml | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/.cirrus.yml b/.cirrus.yml
> > index f53c519447..f4bf49b704 100644
> > --- a/.cirrus.yml
> > +++ b/.cirrus.yml
> > @@ -67,7 +67,7 @@ windows_msys2_task:
> >      CIRRUS_SHELL: powershell
> >      MSYS: winsymlinks:nativestrict
> >      MSYSTEM: MINGW64
> > -    MSYS2_URL:
> https://github.com/msys2/msys2-installer/releases/download/2021-01-05/msys2-base-x86_64-20210105.sfx.exe
> > +    MSYS2_URL:
> https://github.com/msys2/msys2-installer/releases/download/2021-04-19/msys2-base-x86_64-20210419.sfx.exe
> >      MSYS2_FINGERPRINT: 0
> >      MSYS2_PACKAGES: "
> >        diffutils git grep make pkg-config sed
> > @@ -130,7 +130,7 @@ windows_msys2_task:
> >          taskkill /F /FI "MODULES eq msys-2.0.dll"
> >          tasklist
> >          C:\tools\msys64\usr\bin\bash.exe -lc "mv -f
> /etc/pacman.conf.pacnew /etc/pacman.conf || true"
> > -        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Suu
> --overwrite=*"
> > +        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syuu
> --overwrite=*"
> >          Write-Output "Core install time taken:
> $((Get-Date).Subtract($start_time))"
> >          $start_time = Get-Date
> >
> >
>
罗勇刚(Yonggang Luo) May 12, 2021, 4:56 a.m. UTC | #3
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>

On Tue, May 4, 2021 at 6:09 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>
> From: Thomas Huth <thuth@redhat.com>
>
> The MSYS2 task in the Cirrus-CI is currently failing with error messages
> like this:
>
>  warning: database file for 'ucrt64' does not exist (use '-Sy' to
download)
>  :: Starting core system upgrade...
>   there is nothing to do
>  :: Starting full system upgrade...
>  error: failed to prepare transaction (could not find database)
>
> Seems like it can be fixed by switching to a newer release and by
refreshing
> the database one more time after changing the /etc/pacman.conf file.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Message-Id: <20210427185524.281883-1-thuth@redhat.com>
> ---
>  .cirrus.yml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index f53c519447..f4bf49b704 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -67,7 +67,7 @@ windows_msys2_task:
>      CIRRUS_SHELL: powershell
>      MSYS: winsymlinks:nativestrict
>      MSYSTEM: MINGW64
> -    MSYS2_URL:
https://github.com/msys2/msys2-installer/releases/download/2021-01-05/msys2-base-x86_64-20210105.sfx.exe
> +    MSYS2_URL:
https://github.com/msys2/msys2-installer/releases/download/2021-04-19/msys2-base-x86_64-20210419.sfx.exe
>      MSYS2_FINGERPRINT: 0
>      MSYS2_PACKAGES: "
>        diffutils git grep make pkg-config sed
> @@ -130,7 +130,7 @@ windows_msys2_task:
>          taskkill /F /FI "MODULES eq msys-2.0.dll"
>          tasklist
>          C:\tools\msys64\usr\bin\bash.exe -lc "mv -f
/etc/pacman.conf.pacnew /etc/pacman.conf || true"
> -        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Suu
--overwrite=*"
> +        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syuu
--overwrite=*"
>          Write-Output "Core install time taken:
$((Get-Date).Subtract($start_time))"
>          $start_time = Get-Date
>
> --
> 2.20.1
>


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

Patch

diff --git a/.cirrus.yml b/.cirrus.yml
index f53c519447..f4bf49b704 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -67,7 +67,7 @@  windows_msys2_task:
     CIRRUS_SHELL: powershell
     MSYS: winsymlinks:nativestrict
     MSYSTEM: MINGW64
-    MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-01-05/msys2-base-x86_64-20210105.sfx.exe
+    MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-04-19/msys2-base-x86_64-20210419.sfx.exe
     MSYS2_FINGERPRINT: 0
     MSYS2_PACKAGES: "
       diffutils git grep make pkg-config sed
@@ -130,7 +130,7 @@  windows_msys2_task:
         taskkill /F /FI "MODULES eq msys-2.0.dll"
         tasklist
         C:\tools\msys64\usr\bin\bash.exe -lc "mv -f /etc/pacman.conf.pacnew /etc/pacman.conf || true"
-        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Suu --overwrite=*"
+        C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syuu --overwrite=*"
         Write-Output "Core install time taken: $((Get-Date).Subtract($start_time))"
         $start_time = Get-Date