From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Mon, 27 Jun 2022 18:16:54 +0000 (+0200)
Subject: Uninstall strawberryperl
X-Git-Tag: 2.1.0-beta1~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=217420197228489e45dc2677f25f94479dc1df5e;p=thirdparty%2Fzlib-ng.git

Uninstall strawberryperl

strawberryperl installs /c/Strawberry/c/bin/libstdc++-6.dll, which is
incompatible with the mingw64 one. zlib-ng does not need perl, so
simply remove it.
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 9667d5f79..ddafa77f7 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -425,6 +425,9 @@ jobs:
     - name: Install packages (Windows)
       if: runner.os == 'Windows'
       run: |
+        # strawberryperl installs /c/Strawberry/c/bin/libstdc++-6.dll, which is incompatible with the mingw64 one.
+        # zlib-ng does not need perl, so simply remove it.
+        choco uninstall strawberryperl --no-progress
         choco install ninja ${{ matrix.packages }} --no-progress
 
     - name: Install packages (macOS)