authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-06-24 14:53:02-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-06-24 14:53:02-04:00
log2c7fc1c5c504af9dd22d5ac21ecc6773e263e395
tree9df535a5b5fd355da53b3660075ff3b1006744e0
parent3aab6012c471522e2d1cd5a456f56cb9a7addeb6
parent489c31b6f5ad74bfa0ff1d91c049d0c11f931d94

Merge branch 'marler8997-fixAzureMsys2'

closes #5688 closes #5679

2 files changed, 14 insertions(+), 6 deletions(-)

ci/azure/pipelines.yml+13-5
...@@ -40,12 +40,20 @@ jobs:...@@ -40,12 +40,20 @@ jobs:
40 timeoutInMinutes: 36040 timeoutInMinutes: 360
4141
42 steps:42 steps:
43 - powershell: |
44 (New-Object Net.WebClient).DownloadFile("https://github.com/msys2/msys2-installer/releases/download/2020-06-02/msys2-base-x86_64-20200602.sfx.exe", "sfx.exe")
45 .\sfx.exe -y -o\
46 del sfx.exe
47 displayName: Download/Extract/Install MSYS2
43 - script: |48 - script: |
44 git clone https://github.com/msys2/msys2-ci-base.git %CD:~0,2%\msys6449 @REM install updated filesystem package first without dependency checking
45 %CD:~0,2%\msys64\usr\bin\rm -rf %CD:~0,2%\msys64\.git50 @REM because of: https://github.com/msys2/MSYS2-packages/issues/2021
46 set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem51 %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Sydd filesystem"
47 %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu52 displayName: Workaround filesystem dash MSYS2 dependency issue
48 displayName: Install and Update MSYS253 - script: |
54 %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
55 %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
56 displayName: Update MSYS2
49 - task: DownloadSecureFile@157 - task: DownloadSecureFile@1
50 inputs:58 inputs:
51 secureFile: s3cfg59 secureFile: s3cfg
ci/azure/windows_msvc_install+1-1
...@@ -4,7 +4,7 @@ set -x...@@ -4,7 +4,7 @@ set -x
4set -e4set -e
55
6pacman -Su --needed --noconfirm6pacman -Su --needed --noconfirm
7pacman -S --needed --noconfirm wget p7zip python3-pip7pacman -S --needed --noconfirm wget p7zip python3-pip tar xz
8pip install s3cmd8pip install s3cmd
9wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz"9wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz"
10tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz10tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz