From f26daf5c4d8b6b5e168811aa3a0d0a80d70d3ccb Mon Sep 17 00:00:00 2001 From: Frederik Seiffert Date: Thu, 16 Feb 2023 17:15:27 +0100 Subject: [PATCH] CI: fix MSVC builds when building dependencies --- .github/workflows/main.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 004a931f95..2cd73fce8f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -232,10 +232,12 @@ jobs: # make Windows packages like Clang available in MSYS path-type: inherit - - name: Delete MinGW gmake (MSVC) - if: env.IS_WINDOWS_MSVC == 'true' - # delete /c/Strawberry/c/bin/gmake built for MinGW that is found on runners, because we must use make built for MSYS - run: if GMAKE_PATH=`which gmake`; then rm -f "$GMAKE_PATH"; fi + - name: Remove Perl Strawberry installation (MSVC) + if: env.IS_WINDOWS_MSVC == 'true' && github.event.inputs.tools_windows_msvc_branch + # this directory contains various MinGW libraries that can get picked up by CMake + # and a MinGW gmake that we cannot use (we must use MSYS make), so we delete it + run: rmdir /S /Q C:\Strawberry\c + shell: cmd - name: Install Windows packages (MSVC) if: env.IS_WINDOWS_MSVC == 'true'