Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'marler8997-fixAzureMsys2' 

closes #5688
closes #5679
master
Andrew Kelley 2020-06-24 14:53:02 -04:00
parent 3aab6012c4 489c31b6f5
commit 2c7fc1c5c5
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ci/azure/pipelines.yml
View File

@ -40,12 +40,20 @@ jobs:
timeoutInMinutes: 360 timeoutInMinutes: 360
steps: steps:
- powershell: |
(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")
.\sfx.exe -y -o\
del sfx.exe
displayName: Download/Extract/Install MSYS2
- script: | - script: |
git clone https://github.com/msys2/msys2-ci-base.git %CD:~0,2%\msys64 @REM install updated filesystem package first without dependency checking
%CD:~0,2%\msys64\usr\bin\rm -rf %CD:~0,2%\msys64\.git @REM because of: https://github.com/msys2/MSYS2-packages/issues/2021
set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Sydd filesystem"
%CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu displayName: Workaround filesystem dash MSYS2 dependency issue
displayName: Install and Update MSYS2 - script: |
%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
- task: DownloadSecureFile@1 - task: DownloadSecureFile@1
inputs: inputs:
secureFile: s3cfg secureFile: s3cfg

2
ci/azure/windows_msvc_install
View File

@ -4,7 +4,7 @@ set -x
set -e set -e
pacman -Su --needed --noconfirm pacman -Su --needed --noconfirm
pacman -S --needed --noconfirm wget p7zip python3-pip pacman -S --needed --noconfirm wget p7zip python3-pip tar xz
pip install s3cmd pip install s3cmd
wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz" wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz"
tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz