From 38ed3e92b29b009e4c9e47189e3d5c754622ddc6 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sun, 21 Apr 2024 07:08:21 -0400
Subject: [PATCH] build: test nightly nogil on 3.13 and 3.14 also

---
 .github/workflows/python-nightly.yml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/python-nightly.yml b/.github/workflows/python-nightly.yml
index 9319af7b4..92aa06d41 100644
--- a/.github/workflows/python-nightly.yml
+++ b/.github/workflows/python-nightly.yml
@@ -31,7 +31,7 @@ concurrency:
 
 jobs:
   tests:
-    name: "${{ matrix.python-version }} on ${{ matrix.os-short }}"
+    name: "${{ matrix.python-version }}${{ matrix.nogil && ' nogil' || '' }} on ${{ matrix.os-short }}"
     runs-on: "${{ matrix.os }}"
     # If it doesn't finish in an hour, it's not going to. Don't spin for six
     # hours needlessly.
@@ -63,10 +63,26 @@ jobs:
           - "pypy-3.8-nightly"
           - "pypy-3.9-nightly"
           - "pypy-3.10-nightly"
+        nogil:
+          - false
+          # nogil fails for now. hugovk says it's because:
+          # > pip hasn't vendored the new version of packaging yet.
+          # > it should be in 24.1, due some time this month.
+          - true
         include:
-            - python-version: "pypy-3.10-nightly"
-              os: "windows-latest"
-              os-short: "windows"
+          - python-version: "pypy-3.10-nightly"
+            os: "windows-latest"
+            os-short: "windows"
+        exclude:
+          - python-version: "3.12-dev"
+            nogil: true
+          - python-version: "pypy-3.8-nightly"
+            nogil: true
+          - python-version: "pypy-3.9-nightly"
+            nogil: true
+          - python-version: "pypy-3.10-nightly"
+            nogil: true
+
       fail-fast: false
 
     steps:
@@ -78,6 +94,7 @@ jobs:
         if: "!startsWith(matrix.python-version, 'pypy-')"
         with:
           python-version: "${{ matrix.python-version }}"
+          nogil: "${{ matrix.nogil || false }}"
 
       - name: "Install ${{ matrix.python-version }} with setup-python"
         uses: "actions/setup-python@v5"