Skip to content

Commit b606402

Browse files
committed
ci: revert msys2 ca-certificates hack
The hack was added because upstream msys2 broke the ca-certificates package, but since then it has been fixed. This reverts CI to use the upstream package.
1 parent 23f8f65 commit b606402

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

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

-23
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,6 @@ 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-
9887
# Otherwise install MinGW through `pacman`
9988
- bash: |
10089
set -e
@@ -107,18 +96,6 @@ steps:
10796
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
10897
displayName: Download standard MinGW
10998

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-
12299
# Make sure we use the native python interpreter instead of some msys equivalent
123100
# one way or another. The msys interpreters seem to have weird path conversions
124101
# baked in which break LLVM's build system one way or another, so let's use the

0 commit comments

Comments
 (0)