aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-07-28 08:49:42 -0400
committerTom Rini <trini@konsulko.com>2020-07-28 08:49:42 -0400
commitbd33a72f8362ff4a373c9eefaf6e4b3ade521fa4 (patch)
tree2244589d58e9890ffc48a70b369f28f452c019a2
parentf7d0ae9c630a163ec957d492a6b7d115f7edcecc (diff)
parent437e70f7c32d66902bedaeb24fda819b6495f660 (diff)
downloadu-boot-bd33a72f8362ff4a373c9eefaf6e4b3ade521fa4.zip
u-boot-bd33a72f8362ff4a373c9eefaf6e4b3ade521fa4.tar.gz
u-boot-bd33a72f8362ff4a373c9eefaf6e4b3ade521fa4.tar.bz2
Merge branch '2020-07-28-update-azure-tests'
- Update Azure to fix some recent issues with Windows host tool builds
-rw-r--r--.azure-pipelines.yml22
1 files changed, 6 insertions, 16 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 9ba9f1d..c3eb887 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -14,30 +14,20 @@ jobs:
displayName: 'Ensure host tools build for Windows'
pool:
vmImage: $(windows_vm)
- strategy:
- matrix:
- i686:
- MSYS_DIR: msys32
- BASE_REPO: msys2-ci-base-i686
- x86_64:
- MSYS_DIR: msys64
- BASE_REPO: msys2-ci-base
steps:
- - script: |
- git clone https://github.com/msys2/$(BASE_REPO).git %CD:~0,2%\$(MSYS_DIR)
+ - powershell: |
+ (New-Object Net.WebClient).DownloadFile("https://github.com/msys2/msys2-installer/releases/download/2020-07-20/msys2-base-x86_64-20200720.sfx.exe", "sfx.exe")
displayName: 'Install MSYS2'
- script: |
- set PATH=%CD:~0,2%\$(MSYS_DIR)\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
- %CD:~0,2%\$(MSYS_DIR)\usr\bin\pacman --noconfirm -Syyuu
+ sfx.exe -y -o%CD:~0,2%\
+ %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syyuu"
displayName: 'Update MSYS2'
- script: |
- set PATH=%CD:~0,2%\$(MSYS_DIR)\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
- %CD:~0,2%\$(MSYS_DIR)\usr\bin\pacman --noconfirm --needed -S make gcc bison diffutils openssl-devel
+ %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -S make gcc bison flex diffutils openssl-devel"
displayName: 'Install Toolchain'
- script: |
- set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
echo make tools-only_defconfig tools-only NO_SDL=1 > build-tools.sh
- %CD:~0,2%\$(MSYS_DIR)\usr\bin\bash -lc "bash build-tools.sh"
+ %CD:~0,2%\msys64\usr\bin\bash -lc "bash build-tools.sh"
displayName: 'Build Host Tools'
env:
# Tell MSYS2 we need a POSIX emulation layer