From 52b0f2398e21dc330affaf6796044c861704ef31 Mon Sep 17 00:00:00 2001
From: Patrick Lehmann <Paebbels@gmail.com>
Date: Tue, 25 Oct 2022 23:54:06 +0200
Subject: [PATCH] Further improvements.

---
 .github/workflows/Parameters.yml | 47 ++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/Parameters.yml b/.github/workflows/Parameters.yml
index 4321db3..b94200a 100644
--- a/.github/workflows/Parameters.yml
+++ b/.github/workflows/Parameters.yml
@@ -38,7 +38,7 @@ on:
       system_list:
         description: 'Space separated list of systems to run tests on.'
         required: false
-        default: 'ubuntu windows msys2 macos'
+        default: 'ubuntu windows mingw64 macos'
         type: string
       name:
         description: 'Name of the tool.'
@@ -100,10 +100,13 @@ jobs:
           
           if "3.6" in versions:
               print("::warning title=Deprecated::Support for Python 3.6 ended in 2021.12.23.")
+          if "msys2" in systems:
+              print("::warning title=Deprecated::System 'msys2' will be replaced by 'mingw64'.")
           if currentAlphaVersion in versions:
               print(f"::notice title=Experimental::Python {currentAlphaVersion} ({currentAlphaRelease}) is a pre-release.")
           
           data = {
+              # Python and PyPy versions supported by "setup-python" action
               'python': {
                   '3.6':       { 'icon': '⚫',  'until': '2021.12.23' },
                   '3.7':       { 'icon': '🔴',  'until': '2023.06.27' },
@@ -112,15 +115,24 @@ jobs:
                   '3.10':      { 'icon': '🟢',  'until': '2026.10' },
                   '3.11':      { 'icon': '🟢',  'until': '2027.10' },
                   '3.11':      { 'icon': '🟣',  'until': '2028.10' },
-                  'pypy-3.7':  { 'icon': '⟲🔴', 'until': '??' },
-                  'pypy-3.8':  { 'icon': '⟲🟠', 'until': '??' },
-                  'pypy-3.9':  { 'icon': '⟲🟡', 'until': '??' },
+                  'pypy-3.7':  { 'icon': '⟲🔴', 'until': '????.??' },
+                  'pypy-3.8':  { 'icon': '⟲🟠', 'until': '????.??' },
+                  'pypy-3.9':  { 'icon': '⟲🟡', 'until': '????.??' },
               },
+              # Runner systems (runner images) supported by GitHub Actions
               'sys': {
-                  'ubuntu':  { 'icon': '🐧', 'runs-on': 'ubuntu-latest',  'shell': 'bash' },
-                  'windows': { 'icon': '🧊', 'runs-on': 'windows-latest', 'shell': 'pwsh' },
-                  'msys2':   { 'icon': '🟦', 'runs-on': 'windows-latest', 'shell': 'msys2 {0}' },
-                  'macos':   { 'icon': '🍎', 'runs-on': 'macos-latest',   'shell': 'bash' }
+                  'ubuntu':  { 'icon': '🐧', 'runs-on': 'ubuntu-latest',  'shell': 'bash', 'name': "Linux (x86-64)"   },
+                  'windows': { 'icon': '🧊', 'runs-on': 'windows-latest', 'shell': 'pwsh', 'name': "Windows (x86-64)" },
+                  'macos':   { 'icon': '🍎', 'runs-on': 'macos-latest',   'shell': 'bash', 'name': "MacOS (x86-64)"   },
+              },
+              # Runtimes provided by MSYS2
+              'runtime': {
+                  'msys':    { 'icon': '🟪', 'name': 'Windows+MSYS2 (x86-64) - MSYS'    },
+                  'mingw32': { 'icon': '⬛', 'name': 'Windows+MSYS2 (x86-64) - MinGW32' },
+                  'mingw64': { 'icon': '🟦', 'name': 'Windows+MSYS2 (x86-64) - MinGW64' },
+                  'clang32': { 'icon': '🟫', 'name': 'Windows+MSYS2 (x86-64) - Clang32' },
+                  'clang64': { 'icon': '🟧', 'name': 'Windows+MSYS2 (x86-64) - Clang64' },
+                  'ucrt64':  { 'icon': '🟨', 'name': 'Windows+MSYS2 (x86-64) - UCRT64'  },
               }
           }
           
@@ -131,10 +143,23 @@ jobs:
                   'runs-on': data['sys'][system]['runs-on'],
                   'shell':   data['sys'][system]['shell'],
                   'pyicon':  data['python'][version]['icon'],
-                  'python': currentAlphaRelease if version == currentAlphaVersion else version
+                  'python':  currentAlphaRelease if version == currentAlphaVersion else version
+                  'envname'  data['sys'][system]['name']
               }
-              for system in systems
-              for version in (versions if system != 'msys2' else [currentMSYS2Version])
+              for system in systems if system in data['sys'] 
+              for version in versions
+          ] + [
+              {
+                  'sysicon': data['runtime'][runtime]['icon'],
+                  'system':  "msys2",
+                  'runs-on': "windows-latest",
+                  'runtime': runtime.upper(),
+                  'shell':   "msys2 {0}",
+                  'pyicon':  data['python'][currentMSYS2Version]['icon'],
+                  'python':  currentMSYS2Version
+                  'envname'  data['runtime'][runtime]['name']
+              }
+              for runtime in systems if runtime not in data['sys']
           ]
           print(f'::set-output name=python_jobs::{jobs!s}')
           print("Python jobs:")