diff --git a/.github/workflows/cmake_win.yml b/.github/workflows/cmake_win.yml index 3244235d2..337db7d0f 100644 --- a/.github/workflows/cmake_win.yml +++ b/.github/workflows/cmake_win.yml @@ -22,8 +22,7 @@ jobs: environment_script: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat", generators: "Ninja", build: "Debug", - openssl: true, - disable_openssl: "OFF", + openssl: "VC-WIN64A", testing: true } - { @@ -32,8 +31,7 @@ jobs: environment_script: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat", generators: "Ninja", build: "Release", - openssl: true, - disable_openssl: "OFF", + openssl: "VC-WIN64A", testing: true } - { @@ -42,9 +40,7 @@ jobs: environment_script: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsamd64_x86.bat", generators: "Ninja", build: "Debug", - openssl: false, - disable_openssl: "ON", - choco: "--x86", + openssl: "VC-WIN32", testing: false } - { @@ -53,18 +49,20 @@ jobs: environment_script: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsamd64_arm64.bat", generators: "Ninja", build: "Debug", - openssl: false, - disable_openssl: "ON", + openssl: "VC-WIN64-ARM", testing: false } steps: - uses: actions/checkout@v4 - - name: Install OpenSSL - if: ${{ matrix.config.openssl }} + - name: Build OpenSSL + shell: cmd run: | - choco install --no-progress ${{ matrix.config.choco }} openssl --version 3.1.1 + wget https://www.openssl.org/source/openssl-3.1.4.tar.gz + tar -xzf openssl-3.1.4.tar.gz && mv openssl-3.1.4 openssl + cd openssl && perl Configure ${{ matrix.config.openssl }} + cd openssl && nmake && nmake install - name: Build shell: cmd