Let the script figure out OS and arch

Author: hosaka

.github/workflows/main.yml

@@ -54,8 +54,6 @@ jobs:
 
       - name: Test python/qt combinations
         uses: coactions/setup-xvfb@v1
-        env:
-          GITHUB_MATRIX_OS: ${{ matrix.os }}
         with:
           run: bash scripts/test-matrix.sh
 

scripts/test-matrix.sh

@@ -4,7 +4,8 @@ set -euo pipefail
 
 PYTHON_VERSIONS=("3.8" "3.9" "3.10" "3.11" "3.12" "3.13")
 QT_VERSIONS=("pyside2" "pyside6" "pyqt5" "pyqt6")
-OS_NAME="${GITHUB_MATRIX_OS:-$(uname | tr '[:upper:]' '[:lower:]')}"
+TARGET_OS="${GITHUB_MATRIX_OS:-$(uname | tr '[:upper:]' '[:lower:]')}"
+TARGET_ARCH="${GITHUB_MATRIX_ARCH:-$(uname -m)}"
 
 TEST_MATRIX=()
 for PY in "${PYTHON_VERSIONS[@]}"; do
@@ -13,8 +14,8 @@ for PY in "${PYTHON_VERSIONS[@]}"; do
       echo "$QT skipping $PY (requires <3.11)"
       continue
     fi
-    if [[ "$QT" == "pyside2" && "$OS_NAME" == "darwin" && "$(uname -m)" == "arm64" ]]; then
-      echo "$QT skipping $OS_NAME (does not publish arm64 packages)"
+    if [[ "$QT" == "pyside2" && "$TARGET_OS" == "darwin" && "$TARGET_ARCH" == "arm64" ]]; then
+      echo "$QT skipping $TARGET_OS (does not publish arm64 packages)"
       continue
     fi
     if [[ "$QT" == "pyside6" || "$QT" == "pyqt6" ]] && [[ "$PY" == "3.8" ]]; then
@@ -23,7 +24,7 @@ for PY in "${PYTHON_VERSIONS[@]}"; do
     fi
 
     export VIRTUAL_ENV=".venvs/$PY-$QT"
-    echo "Preparing $VIRTUAL_ENV"
+    echo "Preparing $VIRTUAL_ENV "
     uv venv --clear --no-config --no-project --python "$PY" "$VIRTUAL_ENV"
 
     echo "Installing qasync dependencies to $VIRTUAL_ENV"