diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec25488..bbe3b9d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,19 +26,12 @@ jobs: - uses: actions/setup-python@v1 with: python-version: 3.8 - - name: Install nasm - if: matrix.os == 'windows-latest' - run: choco install -y nasm - - name: Install nmake - if: matrix.os == 'windows-latest' - run: | - & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" modify ` - --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise" ` - --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --passive --norestart - shell: powershell - name: Install qemu if: matrix.os == 'ubuntu-latest' uses: docker/setup-qemu-action@v1 + - name: Install nasm + if: matrix.os == 'windows-latest' + run: choco install -y nasm - name: Build OpenSSL env: CIBW_ARCHS: ${{ matrix.arch }} diff --git a/scripts/build-openssl.bat b/scripts/build-openssl.bat index 5ba377b..165bb19 100644 --- a/scripts/build-openssl.bat +++ b/scripts/build-openssl.bat @@ -17,7 +17,7 @@ if %PYTHON_ARCH% == 64 ( ) set outputfile=output\openssl-%platform%.tar.gz -call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VC_ARCH% +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VC_ARCH% SET PATH=%PATH%;C:\Program Files\NASM mkdir openssl