Skip to content

Commit

Permalink
Build Windows binary using msys2
Browse files Browse the repository at this point in the history
We drop support for Windows on x86, use only AMD64.
  • Loading branch information
jlaine committed Nov 4, 2023
1 parent 7f4324a commit 547c00a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 57 deletions.
27 changes: 14 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,40 @@ jobs:
include:
- os: macos-latest
arch: arm64
shell: bash
- os: macos-latest
arch: x86_64
shell: bash
- os: ubuntu-latest
arch: i686
shell: bash
- os: ubuntu-latest
arch: x86_64
shell: bash
- os: windows-latest
arch: AMD64
- os: windows-latest
arch: x86
shell: 'msys2 {0}'
defaults:
run:
shell: ${{ matrix.shell }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
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@v3
- uses: msys2/setup-msys2@v2
if: matrix.os == 'windows-latest'
with:
install: base-devel mingw-w64-x86_64-gcc mingw-w64-x86_64-gperf mingw-w64-x86_64-nasm
path-type: inherit
- name: Build OpenSSL
env:
CIBW_ARCHS: ${{ matrix.arch }}
CIBW_BEFORE_BUILD: python scripts/build-openssl.py /tmp/vendor
CIBW_BEFORE_BUILD_WINDOWS: scripts\build-openssl.bat C:\cibw\vendor
CIBW_BEFORE_BUILD_WINDOWS: python scripts\build-ffmpeg.py C:\cibw\vendor
CIBW_BUILD: cp38-*
CIBW_SKIP: '*-musllinux*'
CIBW_TEST_COMMAND: python -c "import dummy"
Expand Down
44 changes: 0 additions & 44 deletions scripts/build-openssl.bat

This file was deleted.

0 comments on commit 547c00a

Please sign in to comment.