fixups from testurin tests

Author: masklinn

.github/workflows/pyo3-wheels.yml

@@ -53,21 +53,19 @@ jobs:
               and d['arch'] == 'aarch64'
               and d['python-version'] != '3.x'
               )
+              # windows and graal don't work
+              if not (d['platform'] == 'windows' and d['python-version'] == 'graalpy-24')
           ]
           for job in matrix:
               match job['platform']:
                   case 'linux':
                     job['manylinux'] = 'auto'
-                    job['args'] = '--release --out dist -m ua-parser-py/Cargo.toml -i python --zig'
+                    job['args'] = ' --zig'
                   case 'mussllinux':
                     job['manylinux'] = 'musllinux_1_2'
-                    job['args'] = '--release --out dist -m ua-parser-py/Cargo.toml'
-                  case _:
-                    job['args'] = '--release --out dist -m ua-parser-py/Cargo.toml -i python'
 
               job['runs'] = builder[job['platform'], job['arch']]
 
-          print(pprint.pprint(matrix))
           with open(os.environ['GITHUB_OUTPUT'], 'w') as f:
               f.write("matrix=")
               json.dump({'include': matrix}, f)
@@ -82,6 +80,10 @@ jobs:
     runs-on: ${{ matrix.runs }}
 
     steps:
+      - if: matrix.platform != 'windows'
+        run: uname -a
+      - if: matrix.platform == 'windows'
+        run: (Get-CimInstance Win32_operatingsystem).OSArchitecture
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
@@ -107,12 +109,12 @@ jobs:
             ~/.cache/pip
             ~/.cache/pip-graalpy
           key: ${{ runner.os }}-pip-maturin-${{ matrix.python-version }}
-
+      - if: (matrix.platform == 'windows' && matrix.arch == 'aarch64') || (matrix.platform == 'macos' && matrix.arch == 'x86_64')
+        uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
-          target: ${{ matrix.arch }}
-          args: ${{ matrix.args }}
+          args: --release --out dist -m ua-parser-py/Cargo.toml --find-interpreter ${{ matrix.args }}
           sccache: 'true'
           manylinux: ${{ matrix.manylinux }}
       - name: Upload wheels
@@ -168,6 +170,12 @@ jobs:
         exclude:
           - platform: windows
             python-version: graalpy-24
+          - platform: windows
+            arch: aarch64
+            python-version: pypy-3.1
+          - platform: windows
+            arch: aarch64
+            python-version: pypy-3.11
 
         include:
           - wheel: "3.x"
@@ -179,10 +187,18 @@ jobs:
             wheel: "graalpy-24"
 
           - runner: ubuntu-latest
+          - arch: aarch64
+            runner: ubuntu-20.04-arm
           - platform: windows
             runner: windows-latest
+          - platform: windows
+            arch: aarch64
+            runner: windows-11-arm
           - platform: macos
             runner: macos-latest
+          - platform: macos
+            arch: x86_64
+            runner: macos-13
 
     runs-on: ${{ matrix.runner }}
 
@@ -211,7 +227,7 @@ jobs:
       - name: Update pip
         run: python -mpip install --upgrade pip
       - name: Maybe install libyaml-dev
-        if: matrix.runs == 'ubuntu-latest'
+        if: startsWith(matrix.runs, 'ubuntu-latest')
         run: |
           # if binary wheels are not available for the current
           # package install libyaml-dev so we can install pyyaml
@@ -230,7 +246,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     needs: [py-release-tests, py-release-sdist]
-    if: ${{ github.event == 'workflow_dispatch' && inputs.release }}
+    if: github.event == 'workflow_dispatch' && inputs.release
     permissions:
       # Use to sign the release artifacts
       id-token: write