From e9bf1ca588edf74aa816c62240727aae03a52188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Lozier?= <slozier@users.noreply.github.com>
Date: Thu, 8 Oct 2026 09:22:22 -0400
Subject: [PATCH 1/3] Run 3.6 tests during CI

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d352574e9..3c61b741e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -66,6 +66,9 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-22.04, macos-14]
         framework: ['net462', 'net8.0', 'net10.0']
+        stdlib: ['3.4', '3.6']
+
+    name: test (${{ matrix.os }}, ${{ matrix.framework }}, ${{ matrix.stdlib }})
 
     steps:
       # Prerequisites
@@ -73,6 +76,13 @@ jobs:
       with:
         submodules: true
 
+      # Retarget to a different Python version by switching the StdLib branch
+    - name: Checkout StdLib ${{ matrix.stdlib }}
+      if: matrix.stdlib != '3.4'
+      run: |
+        git -C src/core/IronPython.StdLib fetch --depth 1 origin ${{ matrix.stdlib }}
+        git -C src/core/IronPython.StdLib checkout FETCH_HEAD
+
       # Setup .NET
     - name: Setup .NET 10.0
       uses: actions/setup-dotnet@v5

From 2fd96f849b31a005b6e7d6373d8605b57d732273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Lozier?= <slozier@users.noreply.github.com>
Date: Thu, 8 Oct 2026 13:39:23 -0400
Subject: [PATCH 2/3] Increase timeout on test_source_encoding

---
 tests/IronPython.Tests/Cases/CPythonCasesManifest.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/IronPython.Tests/Cases/CPythonCasesManifest.ini b/tests/IronPython.Tests/Cases/CPythonCasesManifest.ini
index 7833c2913..48e9fc26e 100644
--- a/tests/IronPython.Tests/Cases/CPythonCasesManifest.ini
+++ b/tests/IronPython.Tests/Cases/CPythonCasesManifest.ini
@@ -797,6 +797,7 @@ Ignore=true # blocked by https://github.com/IronLanguages/ironpython3/issues/122
 
 [CPython.test_source_encoding]
 IsolationLevel=ENGINE # source file in a non-UTF-8 encoding
+Timeout=300000 # 5 minute timeout - Mono is extremely slow
 
 [CPython.test_spwd] # Module has been removed in 3.13 - https://github.com/IronLanguages/ironpython3/issues/1352
 RunCondition=$(IS_POSIX) AND NOT $(IS_OSX) # https://github.com/IronLanguages/ironpython3/issues/1545

From 41dbc15d898eda2b86a802b17a08c731e76885ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Lozier?= <slozier@users.noreply.github.com>
Date: Thu, 8 Oct 2026 13:57:44 -0400
Subject: [PATCH 3/3] Output version information

---
 .github/workflows/main.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3c61b741e..bc771ca7e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -100,6 +100,13 @@ jobs:
       # Build & Test
     - name: Build
       run: pwsh make.ps1
+    - name: Version Information (${{ matrix.framework }})
+      run: |
+        $ipy = "bin/Release/${{ matrix.framework }}/ipy"
+        if ('${{ matrix.framework }}' -ne 'net462') { dotnet "$ipy.dll" -VV }
+        elseif ($IsWindows) { & "$ipy.exe" -VV }
+        else { mono "$ipy.exe" -VV }
+      shell: pwsh
     - name: Test (${{ matrix.framework }})
       run: ./make.ps1 -frameworks ${{ matrix.framework }} test-all
       shell: pwsh