Skip to content

Commit 10a52c2

Browse files
committed
Auto merge of #65762 - mati865:msys2-bug, r=pietroalbini
workaround msys2 bug
2 parents 8e0007f + 2fea525 commit 10a52c2

File tree

1 file changed

+23
-0
lines changed

1 file changed

+23
-0
lines changed

src/ci/azure-pipelines/steps/install-windows-build-deps.yml

+23
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,17 @@ steps:
8484
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), ne(variables['MINGW_URL'],''))
8585
displayName: Download custom MinGW
8686

87+
# FIXME(#65767): workaround msys bug, step 1
88+
- bash: |
89+
set -e
90+
arch=i686
91+
if [ "$MSYS_BITS" = "64" ]; then
92+
arch=x86_64
93+
fi
94+
curl -O https://ci-mirrors.rust-lang.org/rustc/msys2-repo/mingw/$arch/mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
95+
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
96+
displayName: Download working ca-certificates for msys
97+
8798
# Otherwise install MinGW through `pacman`
8899
- bash: |
89100
set -e
@@ -96,6 +107,18 @@ steps:
96107
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
97108
displayName: Download standard MinGW
98109

110+
# FIXME(#65767): workaround msys bug, step 2
111+
- bash: |
112+
set -e
113+
arch=i686
114+
if [ "$MSYS_BITS" = "64" ]; then
115+
arch=x86_64
116+
fi
117+
pacman -U --noconfirm --noprogressbar mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
118+
rm mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz
119+
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
120+
displayName: Install working ca-certificates for msys
121+
99122
# Make sure we use the native python interpreter instead of some msys equivalent
100123
# one way or another. The msys interpreters seem to have weird path conversions
101124
# baked in which break LLVM's build system one way or another, so let's use the

0 commit comments

Comments
 (0)