Skip to contentSkip to conversation

CI: Azure: Rework how we update MSYS2

PATCH In review Tom Rini 1 participant 3 messages May 3, 2022

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 CI: Azure: Rework how we update MSYS2

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.

---
 .azure-pipelines.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
.azure-pipelines.yml +3 -2
index f9acb9898ea9..3f211b86e4b2 100644
@@ -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"
Signature · 1 line
2.25.1
author
#1 lore raw
Quoted 6 lines · 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.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
author
#2 lore raw
Quoted 10 lines · Tom Rini
Quoted 6 lines · 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.

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.

Signature · 1 line
Tom