Skip to content

Commit aa1df8b

Browse files
authored
Add Windows ARM64 build (#796)
1 parent 825218f commit aa1df8b

1 file changed

Lines changed: 16 additions & 5 deletions

File tree

‎.github/workflows/windows.yaml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,17 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: windows-latest
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
include:
15+
- os: windows-latest
16+
cmake_arch: x64
17+
cibw_arch: AMD64
18+
- os: windows-11-arm
19+
cmake_arch: ARM64
20+
cibw_arch: ARM64
21+
runs-on: ${{ matrix.os }}
1222
env:
1323
CONNECTOR_VERSION: "3.4.8"
1424
steps:
@@ -17,7 +27,7 @@ jobs:
1727
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
1828
with:
1929
path: c:/mariadb-connector
20-
key: mariadb-connector-c-${{ env.CONNECTOR_VERSION }}-win-2
30+
key: mariadb-connector-c-${{ env.CONNECTOR_VERSION }}-win-${{ matrix.cmake_arch }}-2
2131

2232
- name: Download and Unzip Connector
2333
if: steps.cache-connector.outputs.cache-hit != 'true'
@@ -39,7 +49,7 @@ jobs:
3949
shell: cmd
4050
working-directory: c:/mariadb-connector-src/build
4151
run: |
42-
cmake -A x64 .. -DCMAKE_BUILD_TYPE=Release -DCLIENT_PLUGIN_DIALOG=static -DCLIENT_PLUGIN_SHA256_PASSWORD=static -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=static -DDEFAULT_SSL_VERIFY_SERVER_CERT=0
52+
cmake -A ${{ matrix.cmake_arch }} .. -DCMAKE_BUILD_TYPE=Release -DCLIENT_PLUGIN_DIALOG=static -DCLIENT_PLUGIN_SHA256_PASSWORD=static -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=static -DDEFAULT_SSL_VERIFY_SERVER_CERT=0
4353
4454
- name: cmake build
4555
if: steps.cache-connector.outputs.cache-hit != 'true'
@@ -80,11 +90,12 @@ jobs:
8090
working-directory: mysqlclient
8191
env:
8292
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.10"
83-
CIBW_ARCHS: "AMD64"
93+
CIBW_ARCHS: ${{ matrix.cibw_arch }}
8494
CIBW_TEST_COMMAND: 'python -c "import MySQLdb; print(MySQLdb.version_info)" '
8595
run: "python -m cibuildwheel --output-dir dist"
8696

8797
- name: Build sdist
98+
if: matrix.cibw_arch == 'AMD64'
8899
working-directory: mysqlclient
89100
run: |
90101
python -m pip install build
@@ -93,5 +104,5 @@ jobs:
93104
- name: Upload Wheel
94105
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
95106
with:
96-
name: win-wheels
107+
name: win-wheels-${{ matrix.cibw_arch }}
97108
path: mysqlclient/dist/*.*

0 commit comments

Comments
 (0)