[PATCH] CI: Azure: Rework how we update MSYS2

[PATCH] CI: Azure: Rework how we update MSYS2

[Tom Rini]

Based on reading https://www.msys2.org/docs/ci/ and "Other Systems"
rework how we update MSYS2 to the current version.  We run it once, to
perform nothing other than being the first run, then we run pacman
twice.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 .azure-pipelines.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index f9acb9898ea9..3f211b86e4b2 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -22,8 +22,9 @@ stages:
         displayName: 'Install MSYS2'
       - script: |
           sfx.exe -y -o%CD:~0,2%\
-          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syyuu"
-          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Su"
+          %CD:~0,2%\msys64\usr\bin\bash -lc " "
+          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
+          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
         displayName: 'Update MSYS2'
       - script: |
           %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -Sy make gcc bison flex diffutils openssl-devel libgnutls-devel libutil-linux-devel"
-- 
2.25.1

Re: [PATCH] CI: Azure: Rework how we update MSYS2

[Tom Rini]

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

On Tue, May 03, 2022 at 08:30:14AM -0400, Tom Rini wrote:

> Based on reading https://www.msys2.org/docs/ci/ and "Other Systems"
> rework how we update MSYS2 to the current version.  We run it once, to
> perform nothing other than being the first run, then we run pacman
> twice.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH] CI: Azure: Rework how we update MSYS2

[Tom Rini]

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

On Tue, May 03, 2022 at 11:06:24AM -0400, Tom Rini wrote:
> On Tue, May 03, 2022 at 08:30:14AM -0400, Tom Rini wrote:
> 
> > Based on reading https://www.msys2.org/docs/ci/ and "Other Systems"
> > rework how we update MSYS2 to the current version.  We run it once, to
> > perform nothing other than being the first run, then we run pacman
> > twice.
> > 
> > Signed-off-by: Tom Rini <trini@konsulko.com>
> 
> Applied to u-boot/master, thanks!

For the record, I pushed this quickly because CI was breaking due to
general upstream changes.  Following the MSYS2 upstream instructions for
how to update the system in CI resolved things, so I feel confident
enough in this being the right set of changes to do here.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]