From 10f4db0b6aaa8ff91429a103db60cfd5808efa5c Mon Sep 17 00:00:00 2001
From: A5rocks <git@helvetica.moe>
Date: Tue, 21 Apr 2026 16:11:49 -0400
Subject: [PATCH 1/2] Experiment with setup-uv

---
 .github/workflows/ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2427c3997..388ebb10e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -168,24 +168,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
-        arch: ['x86', 'x64']
+        python: ['cpython-3.10', 'cpython-3.11', 'cpython-3.12', 'cpython-3.13', 'cpython-3.14', 'cpython-3.14+freethreaded']
+        arch: ['x86', 'x86_64']
         lsp: ['']
         lsp_extract_file: ['']
         extra_name: ['']
         include:
-          - python: '3.10'
-            arch: 'x64'
+          - python: 'cpython-3.10'
+            arch: 'x86_64'
             lsp: 'https://raw.githubusercontent.com/python-trio/trio-ci-assets/master/komodia-based-vpn-setup.zip'
             lsp_extract_file: 'komodia-based-vpn-setup.exe'
             extra_name: ', with Komodia LSP'
-          - python: '3.10'
-            arch: 'x64'
+          - python: 'cpython-3.10'
+            arch: 'x86_64'
             lsp: 'https://www.proxifier.com/download/legacy/ProxifierSetup342.exe'
             lsp_extract_file: ''
             extra_name: ', with IFS LSP'
           - python: 'pypy-3.11'
-            arch: 'x64'
+            arch: 'x86_64'
             lsp: ''
             lsp_extract_file: ''
             extra_name: ''
@@ -211,11 +211,11 @@ jobs:
           source-tarball-name: ${{ needs.build.outputs.sdist-artifact-name }}
           workflow-artifact-name: ${{ env.dists-artifact-name }}
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: astral-sh/setup-uv@v8.1.0
         with:
-          python-version: '${{ matrix.python }}'
-          architecture: '${{ matrix.arch }}'
-          allow-prereleases: true
+          python-version: '${{ matrix.python }}-windows-${{ matrix.arch }}-none'
+          activate-environment: "true"
+      - run: uv pip install pip
       - name: Run tests
         run: ./ci.sh
         shell: bash

From 682410fc6fe1001f093e2cd6e11dd8dee993e2d5 Mon Sep 17 00:00:00 2001
From: A5rocks <git@helvetica.moe>
Date: Tue, 21 Apr 2026 16:31:53 -0400
Subject: [PATCH 2/2] Simplify things

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 388ebb10e..398a7ae04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -168,18 +168,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['cpython-3.10', 'cpython-3.11', 'cpython-3.12', 'cpython-3.13', 'cpython-3.14', 'cpython-3.14+freethreaded']
+        python: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14+freethreaded']
         arch: ['x86', 'x86_64']
         lsp: ['']
         lsp_extract_file: ['']
         extra_name: ['']
         include:
-          - python: 'cpython-3.10'
+          - python: '3.10'
             arch: 'x86_64'
             lsp: 'https://raw.githubusercontent.com/python-trio/trio-ci-assets/master/komodia-based-vpn-setup.zip'
             lsp_extract_file: 'komodia-based-vpn-setup.exe'
             extra_name: ', with Komodia LSP'
-          - python: 'cpython-3.10'
+          - python: '3.10'
             arch: 'x86_64'
             lsp: 'https://www.proxifier.com/download/legacy/ProxifierSetup342.exe'
             lsp_extract_file: ''
@@ -213,7 +213,7 @@ jobs:
       - name: Setup Python
         uses: astral-sh/setup-uv@v8.1.0
         with:
-          python-version: '${{ matrix.python }}-windows-${{ matrix.arch }}-none'
+          python-version: ${{ case(startsWith(matrix.python, 'pypy'), matrix.python, format('cpython-{0}', matrix.python)) }}-windows-${{ matrix.arch }}-none
           activate-environment: "true"
       - run: uv pip install pip
       - name: Run tests