From 261b70a5411df3a70f37a977725ba2ff00798c11 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Wed, 8 May 2024 10:40:16 +0100
Subject: [PATCH] Apply the same approach to test-pypi-sdist

---
 .github/workflows/test-from-pypi.yml | 34 ++++++++++++----------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test-from-pypi.yml b/.github/workflows/test-from-pypi.yml
index aa9937038..fe0d4c60a 100644
--- a/.github/workflows/test-from-pypi.yml
+++ b/.github/workflows/test-from-pypi.yml
@@ -45,32 +45,26 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
-        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-        python-architecture: [x86, x64, arm64]
-        exclude:
-        - os: ubuntu-latest
-          python-architecture: arm64
-        - os: ubuntu-latest
-          python-architecture: x86
-        - os: windows-latest
-          python-architecture: arm64
-        - os: macos-latest
-          python-architecture: x86
-        - os: macos-latest
-          python-architecture: x64
-        - os: macos-13
-          python-architecture: x86
-        - os: macos-13
-          python-architecture: arm64
+        platform:
+          - os: ubuntu-latest
+            architecture: x64
+          - os: windows-latest
+            architecture: x64
+          - os: windows-latest
+            architecture: x86
+          - os: macos-latest
+            architecture: arm64
+          - os: macos-13
+            architecture: x64
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.platform.os }}
 
     steps:
-    - name: Set up Python ${{ matrix.python-version }} (${{ matrix.python-architecture }})
+    - name: Set up Python ${{ matrix.python-version }} (${{ matrix.platform.architecture }})
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        architecture: ${{ matrix.python-architecture }}
+        architecture: ${{ matrix.platform.architecture }}
         allow-prereleases: true
     - name: Install test dependencies and Traits from PyPI wheel
       run: |