Integration CI Tests: Extend matrix for more runners and two Electron versions

Author: softworkz

.github/workflows/integration-tests.yml

@@ -12,18 +12,13 @@ concurrency:
 
 jobs:
   tests:
-    name: Integration Tests (${{ matrix.os }})
+    name: Integration Tests (${{ matrix.os }} / Electron ${{ matrix.electronVersion }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: ubuntu-24.04
-            rid: linux-x64
-          - os: windows-2022
-            rid: win-x64
-          - os: macos-14
-            rid: osx-arm64
+        os: [ubuntu-22.04, ubuntu-24.04, windows-2022, windows-2025, macos-14, macos-26]
+        electronVersion: ['30.4.0', '38.2.2']
 
     env:
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
@@ -45,11 +40,22 @@ jobs:
         with:
           node-version: '22'
 
+      - name: Set RID (derived from OS)
+        shell: bash
+        run: |
+          case "${{ matrix.os }}" in
+            ubuntu-* ) echo "RID=linux-x64" >> $GITHUB_ENV ;;
+            windows-* ) echo "RID=win-x64" >> $GITHUB_ENV ;;
+            macos-* ) echo "RID=osx-arm64" >> $GITHUB_ENV ;;
+            * ) echo "Unknown OS ${{ matrix.os }}"; exit 1 ;;
+          esac
+          echo "Using RID=$RID"
+
       - name: Restore
-        run: dotnet restore -r ${{ matrix.rid }} -p:RuntimeIdentifier=${{ matrix.rid }} src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
+        run: dotnet restore -r $RID -p:RuntimeIdentifier=$RID -p:ElectronVersion=${{ matrix.electronVersion }} src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
 
       - name: Build
-        run: dotnet build --no-restore -c Release -r ${{ matrix.rid }} -p:RuntimeIdentifier=${{ matrix.rid }} src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
+        run: dotnet build --no-restore -c Release -r $RID -p:RuntimeIdentifier=$RID -p:ElectronVersion=${{ matrix.electronVersion }} src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj
 
       - name: Install Linux GUI dependencies
         if: runner.os == 'Linux'
@@ -64,32 +70,32 @@ jobs:
         if: runner.os == 'Linux'
         continue-on-error: true
         run: |
-          mkdir -p test-results/Ubuntu
+          mkdir -p test-results
           xvfb-run -a dotnet test src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj \
-            -c Release --no-build -r ${{ matrix.rid }} -p:RuntimeIdentifier=${{ matrix.rid }} \
-            --logger "trx;LogFileName=Ubuntu.trx" \
+            -c Release --no-build -r $RID -p:RuntimeIdentifier=$RID -p:ElectronVersion=${{ matrix.electronVersion }} \
+            --logger "trx;LogFileName=${{ runner.os }}-electron-${{ matrix.electronVersion }}.trx" \
             --logger "console;verbosity=detailed" \
             --results-directory test-results
 
       - name: Run tests (Windows)
         if: runner.os == 'Windows'
         continue-on-error: true
         run: |
-          New-Item -ItemType Directory -Force -Path test-results/Windows | Out-Null
-          dotnet test src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj -c Release --no-build -r ${{ matrix.rid }} -p:RuntimeIdentifier=${{ matrix.rid }} --logger "trx;LogFileName=Windows.trx" --logger "console;verbosity=detailed" --results-directory test-results
+          New-Item -ItemType Directory -Force -Path test-results | Out-Null
+          dotnet test src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj -c Release --no-build -r $RID -p:RuntimeIdentifier=$RID -p:ElectronVersion=${{ matrix.electronVersion }} --logger "trx;LogFileName=${{ runner.os }}-electron-${{ matrix.electronVersion }}.trx" --logger "console;verbosity=detailed" --results-directory test-results
 
       - name: Run tests (macOS)
         if: runner.os == 'macOS'
         continue-on-error: true
         run: |
-          mkdir -p test-results/macOS
-          dotnet test src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj -c Release --no-build -r ${{ matrix.rid }} -p:RuntimeIdentifier=${{ matrix.rid }} --logger "trx;LogFileName=macOS.trx" --logger "console;verbosity=detailed" --results-directory test-results
+          mkdir -p test-results
+          dotnet test src/ElectronNET.IntegrationTests/ElectronNET.IntegrationTests.csproj -c Release --no-build -r $RID -p:RuntimeIdentifier=$RID -p:ElectronVersion=${{ matrix.electronVersion }} --logger "trx;LogFileName=${{ runner.os }}-electron-${{ matrix.electronVersion }}.trx" --logger "console;verbosity=detailed" --results-directory test-results
 
       - name: Upload raw test results
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: test-results-${{ matrix.os }}
+          name: test-results-${{ matrix.os }}-electron-${{ matrix.electronVersion }}
           path: test-results/*.trx
           retention-days: 7
 
@@ -121,23 +127,25 @@ jobs:
           dotnet new tool-manifest
           dotnet tool install DotnetCtrfJsonReporter --local
 
-      - name: Convert TRX → CTRF and clean names (keep suites; set filePath=OS)
+      - name: Convert TRX → CTRF and clean names (filePath=OS|Electron X.Y.Z)
         shell: bash
         run: |
           set -euo pipefail
           mkdir -p ctrf
           shopt -s globstar nullglob
           conv=0
           for trx in test-results/**/*.trx; do
-            fname="$(basename "$trx")"
-            os="${fname%.trx}"
-            outdir="ctrf/${os}"
+            base="$(basename "$trx" .trx)"  # e.g. Windows-electron-30.4.0
+            os="${base%%-electron-*}"
+            electron="${base#*-electron-}"
+            label="$os|Electron $electron"
+            outdir="ctrf/${label}"
             mkdir -p "$outdir"
             out="${outdir}/ctrf-report.json"
 
             dotnet tool run DotnetCtrfJsonReporter -p "$trx" -d "$outdir" -f "ctrf-report.json"
 
-            jq --arg os "$os" '.results.tests |= map(.filePath = $os)' "$out" > "${out}.tmp" && mv "${out}.tmp" "$out"
+            jq --arg fp "$label" '.results.tests |= map(.filePath = $fp)' "$out" > "${out}.tmp" && mv "${out}.tmp" "$out"
 
             echo "Converted & normalized $trx -> $out"
             conv=$((conv+1))