From 616d45fc9606564abd2a976c3890a13900662893 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Sun, 5 Oct 2025 05:22:12 +0200
Subject: [PATCH 1/3] Add Python 3.14 to the testing

---
 .github/workflows/push.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index c391ff9f..b80669da 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -12,18 +12,19 @@ jobs:
            - '3.11'
            - '3.12'
            - '3.13'
-           - 'pypy-3.9'
+           - '3.14'
+           - 'pypy-3.11'
         java:
           - '8'
           - '11'
           - '23'
         os:
-          # macos-latest (ATM macos-14) runs on Apple Silicon,
-          # macos-13 runs on Intel
+          # macos-latest (ATM macos-15) runs on Apple Silicon,
+          # macos-15-intel runs on Intel
           - 'ubuntu-latest'
           - 'windows-latest'
           - 'macos-latest'
-          - 'macos-13'
+          - 'macos-15-intel'
         architecture:
           - 'x64'
           - 'x86'
@@ -36,9 +37,9 @@ jobs:
             architecture: aarch64
           - os: ubuntu-latest
             architecture: x86
-          - os: macos-13
+          - os: macos-15-inte
             architecture: aarch64
-          - os: macos-13
+          - os: macos-15-inte
             architecture: x86
           - os: macos-latest
             architecture: aarch64
@@ -49,7 +50,7 @@ jobs:
             architecture: x86
           - os: windows-latest
             architecture: x86
-            python: 'pypy-3.9'
+            python: 'pypy-3.11'
           - os: windows-latest
             architecture: x86
             java: '20'
@@ -68,20 +69,21 @@ jobs:
     - uses: actions/checkout@master
 
     - name: Setup python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.architecture == 'aarch64' && 'arm64' || matrix.architecture }}
+        allow-prereleases: true
 
     - name: Setup java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: ${{ matrix.java }}
         distribution: 'temurin'
         architecture: ${{ matrix.architecture }}
 
     - name: (macOS) Setup test dependencies
-      if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
+      if: matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel'
       run: brew install ant
 
     - name: Build test classes via ant
@@ -92,7 +94,7 @@ jobs:
         pip install --timeout=120 .[dev,ci]
   
     - name: (Windows) Test pyjnius via pytest
-      if: matrix.os == 'windows-latest'
+      if: runner.os == 'Windows'
       run: |
         $env:PATH +=";$env:JAVA_HOME\jre\bin\server\;$env:JAVA_HOME\jre\bin\client\;$env:JAVA_HOME\bin\server\"
         $env:CLASSPATH ="../build/test-classes;../build/classes"
@@ -100,7 +102,7 @@ jobs:
         pytest -v
 
     - name: (Linux, macOS) Test pyjnius via pytest
-      if: (matrix.os == 'ubuntu-latest') || (matrix.os == 'macos-latest') || (matrix.os == 'macos-13')
+      if: runner.os != 'Windows'
       run: |
         cd tests
         CLASSPATH=../build/test-classes:../build/classes python -m pytest -v

From 674705cba13f9344a83c5c0545d613d35768bed0 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Sun, 5 Oct 2025 05:29:36 +0200
Subject: [PATCH 2/3] Fix macOS architecture labels in workflow

---
 .github/workflows/push.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index b80669da..df2c2a09 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -37,9 +37,9 @@ jobs:
             architecture: aarch64
           - os: ubuntu-latest
             architecture: x86
-          - os: macos-15-inte
+          - os: macos-15-intel
             architecture: aarch64
-          - os: macos-15-inte
+          - os: macos-15-intel
             architecture: x86
           - os: macos-latest
             architecture: aarch64
@@ -68,14 +68,14 @@ jobs:
     steps:
     - uses: actions/checkout@master
 
-    - name: Setup python
+    - name: Setup Python ${{ matrix.python }}
       uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.architecture == 'aarch64' && 'arm64' || matrix.architecture }}
         allow-prereleases: true
 
-    - name: Setup java
+    - name: Setup Java ${{ matrix.java }}
       uses: actions/setup-java@v5
       with:
         java-version: ${{ matrix.java }}
@@ -83,7 +83,7 @@ jobs:
         architecture: ${{ matrix.architecture }}
 
     - name: (macOS) Setup test dependencies
-      if: matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel'
+      if: runner.os == 'macOS'
       run: brew install ant
 
     - name: Build test classes via ant

From 6a7be06f88b3891bea9687b75f25c8707b176771 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Tue, 7 Oct 2025 13:20:25 +0200
Subject: [PATCH 3/3] Add Python version '3.14t' to workflow

---
 .github/workflows/push.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index df2c2a09..14793f62 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -13,6 +13,7 @@ jobs:
            - '3.12'
            - '3.13'
            - '3.14'
+           - '3.14t'
            - 'pypy-3.11'
         java:
           - '8'