Make 32bit Windows build instead
This commit is contained in:
parent
0ba61bb590
commit
3eee38fedd
20
.github/workflows/build.yml
vendored
20
.github/workflows/build.yml
vendored
@ -22,7 +22,7 @@ jobs:
|
|||||||
- os: windows-2022
|
- os: windows-2022
|
||||||
qt_version: 5.15.2
|
qt_version: 5.15.2
|
||||||
qt_host: windows
|
qt_host: windows
|
||||||
qt_arch: win64_mingw81
|
qt_arch: win32_mingw81
|
||||||
|
|
||||||
- os: macos-11
|
- os: macos-11
|
||||||
qt_version: 5.12.12
|
qt_version: 5.12.12
|
||||||
@ -37,6 +37,16 @@ jobs:
|
|||||||
BUILD_DIR: "build"
|
BUILD_DIR: "build"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: Install 32bit mingw on Windows
|
||||||
|
if: runner.os == 'Windows'
|
||||||
|
uses: egor-tensin/setup-mingw@v2
|
||||||
|
with:
|
||||||
|
platform: x86
|
||||||
|
|
||||||
|
- name: Install 32bit zlib via Strawberry on Windows
|
||||||
|
if: runner.os == 'Windows'
|
||||||
|
run: |
|
||||||
|
choco install strawberryperl -y --force --x86
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
@ -53,7 +63,7 @@ jobs:
|
|||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: "${{ github.workspace }}/Qt/"
|
path: "${{ github.workspace }}/Qt/"
|
||||||
key: ${{ runner.os }}-${{ matrix.qt_version }}-qt_cache
|
key: ${{ runner.os }}-${{ matrix.qt_version }}-${{ matrix.qt_arch }}-qt_cache
|
||||||
|
|
||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
uses: jurplel/install-qt-action@v2
|
uses: jurplel/install-qt-action@v2
|
||||||
@ -136,9 +146,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
python -m pip install aqtinstall==2.0.5
|
python -m pip install aqtinstall==2.0.5
|
||||||
python -m aqt install-tool -O "${{ github.workspace }}\Qt\" windows desktop tools_openssl_x64
|
python -m aqt install-tool -O "${{ github.workspace }}\Qt\" windows desktop tools_openssl_x86
|
||||||
copy "${{ github.workspace }}\Qt\Tools\OpenSSL\Win_x64\bin\libssl-1_1-x64.dll" "${{ github.workspace }}\${{ env.INSTALL_DIR }}\"
|
copy "${{ github.workspace }}\Qt\Tools\OpenSSL\Win_x86\bin\libssl-1_1.dll" "${{ github.workspace }}\${{ env.INSTALL_DIR }}\"
|
||||||
copy "${{ github.workspace }}\Qt\Tools\OpenSSL\Win_x64\bin\libcrypto-1_1-x64.dll" "${{ github.workspace }}\${{ env.INSTALL_DIR }}\"
|
copy "${{ github.workspace }}\Qt\Tools\OpenSSL\Win_x86\bin\libcrypto-1_1.dll" "${{ github.workspace }}\${{ env.INSTALL_DIR }}\"
|
||||||
|
|
||||||
- name: Run macdeployqt
|
- name: Run macdeployqt
|
||||||
if: runner.os == 'macOS'
|
if: runner.os == 'macOS'
|
||||||
|
Loading…
Reference in New Issue
Block a user