From a0e7a2561fe079a6b6a5befe5344160fc78e2e71 Mon Sep 17 00:00:00 2001 From: TheTank20 <57580668+thepwrtank18@users.noreply.github.com> Date: Mon, 7 Jul 2025 15:28:52 -0500 Subject: [PATCH] move msys --- .github/workflows/windows.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 37fbf20..423e3e9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -51,19 +51,6 @@ jobs: $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine) - - name: Setup MSYS2 - if: matrix.arch != 'arm64' - uses: msys2/setup-msys2@v2 - with: - msystem: ${{ matrix.arch == 'x86' && 'MINGW32' || 'MINGW64' }} - update: true - install: >- - mingw-w64-${{ matrix.arch == 'x86' && 'i686' || 'x86_64' }}-gcc - mingw-w64-${{ matrix.arch == 'x86' && 'i686' || 'x86_64' }}-make - mingw-w64-x86_64-perl - perl - git - - name: Setup MSVC for ARM64 if: matrix.arch == 'arm64' uses: ilammy/msvc-dev-cmd@v1 @@ -91,6 +78,19 @@ jobs: ${{ github.workspace }}/OpenSSL-TDM-64 key: openssl-3.1.2-x64-${{ hashFiles('**/CMakeLists.txt') }} + - name: Setup MSYS2 + if: matrix.arch != 'arm64' && steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true' + uses: msys2/setup-msys2@v2 + with: + msystem: ${{ matrix.arch == 'x86' && 'MINGW32' || 'MINGW64' }} + update: true + install: >- + mingw-w64-${{ matrix.arch == 'x86' && 'i686' || 'x86_64' }}-gcc + mingw-w64-${{ matrix.arch == 'x86' && 'i686' || 'x86_64' }}-make + mingw-w64-x86_64-perl + perl + git + - name: Checkout and Compile OpenSSL 3.1.2 if: matrix.arch != 'arm64' && steps.cache-openssl-32.outputs.cache-hit != 'true' && steps.cache-openssl-64.outputs.cache-hit != 'true' shell: msys2 {0}