From c5eb637d55fe1043b1f240c6d1b13900211a2a68 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Tue, 23 Apr 2024 14:07:47 +0200
Subject: [PATCH] ci: cleanup TFM jobs

---
 .github/workflows/amd64_tfm.yml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/amd64_tfm.yml b/.github/workflows/amd64_tfm.yml
index 7f398d7..8ca8ef8 100644
--- a/.github/workflows/amd64_tfm.yml
+++ b/.github/workflows/amd64_tfm.yml
@@ -5,31 +5,32 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   # Building using the github runner environement directly.
   msvc:
-    runs-on: windows-latest
     strategy:
        matrix:
-         lang: [7.3, 8.0, 9.0]
-         build: [46, 461, 462, 48, CORE_31, STD_20, STD_21, 6, 7]
-         example: [net48, netstandard2.0, netstandard2.1, netcoreapp3.1, net5.0, net6.0, net7.0]
+         # 8:Core3.0, 9:.Net5, 10:.Net6, 11:.Net7, 12:.Net8
+         lang: [8.0, 10.0, 11.0, 12.0]
+         build: [462, 48, 6, 7, 8]
+         example: [net462, net48, netcoreapp3.1, net6.0, net7.0, net8.0]
        fail-fast: false
+    name: MSVC x lang:${{ matrix.lang }}, build:${{ matrix.build }}, test:${{ matrix.example }}
+    runs-on: windows-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Install SWIG 4.1.1
+    - name: Install SWIG 4.2.1
       run: |
-        (New-Object System.Net.WebClient).DownloadFile("http://prdownloads.sourceforge.net/swig/swigwin-4.1.1.zip","swigwin-4.1.1.zip");
-        Expand-Archive .\swigwin-4.1.1.zip .;
-        echo "$((Get-Item .).FullName)/swigwin-4.1.1" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        (New-Object System.Net.WebClient).DownloadFile("http://prdownloads.sourceforge.net/swig/swigwin-4.2.1.zip","swigwin-4.2.1.zip");
+        Expand-Archive .\swigwin-4.2.1.zip .;
+        echo "$((Get-Item .).FullName)/swigwin-4.2.1" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
     - name: Check swig
       run: swig -version
       # Install .NET SDKs
-    - name: Setup .NET Core 3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
-    - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET Core 3.1, 6.0, 8.0
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          '3.1.x'
+          '6.0.x'
+          '8.0.x'
     - name: Check dotnet
       run: dotnet --info
     - name: Check cmake