diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 78de1204cf..5dc8b1433a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -431,8 +431,6 @@ jobs: PATH="$(cygpath "${USERPROFILE}")/my-cache/${{ matrix.dir }}/bin:/c/msys64/usr/bin:$PATH" for _chkprefill in '' ${{ matrix.chkprefill }}; do options='' - [ '${{ matrix.type }}' = 'Debug' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG=' - [ '${{ matrix.type }}' = 'Release' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=' [ "${_chkprefill}" = '_chkprefill' ] && options+=' -D_CURL_PREFILL=OFF' cmake -B "bld${_chkprefill}" -G 'MSYS Makefiles' ${options} \ -DCMAKE_C_COMPILER=gcc \ @@ -460,7 +458,7 @@ jobs: timeout-minutes: 5 run: | PATH="$(cygpath "${USERPROFILE}")/my-cache/${{ matrix.dir }}/bin:/c/msys64/usr/bin:$PATH" - cmake --build bld --config '${{ matrix.type }}' + cmake --build bld - name: 'curl version' timeout-minutes: 1 @@ -474,7 +472,7 @@ jobs: timeout-minutes: 10 run: | PATH="$(cygpath "${USERPROFILE}")/my-cache/${{ matrix.dir }}/bin:/c/msys64/usr/bin:$PATH" - cmake --build bld --config '${{ matrix.type }}' --target testdeps + cmake --build bld --target testdeps - name: 'install test prereqs' if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }} @@ -503,13 +501,13 @@ jobs: TFLAGS+=" -ac $(cygpath "${SYSTEMROOT}/System32/curl.exe")" fi PATH="$PWD/bld/lib:$PATH:/c/Program Files (x86)/stunnel/bin" - cmake --build bld --config '${{ matrix.type }}' --target test-ci + cmake --build bld --target test-ci - name: 'build examples' timeout-minutes: 5 run: | PATH="$(cygpath "${USERPROFILE}")/my-cache/${{ matrix.dir }}/bin:/c/msys64/usr/bin:$PATH" - cmake --build bld --config '${{ matrix.type }}' --target curl-examples + cmake --build bld --target curl-examples linux-cross-mingw-w64: name: "linux-mingw, ${{ matrix.build == 'cmake' && 'CM' || 'AM' }} ${{ matrix.compiler }}"