Simplify the code structure of test.yaml

Author: JamePeng

.github/workflows/test.yaml

@@ -1,4 +1,5 @@
 name: Tests
+
 on:
   pull_request:
     branches:
@@ -7,165 +8,117 @@ on:
     branches:
       - main
 
+# Auto-cancel stale runs on the same PR/branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 env:
   REPO_ID: Qwen/Qwen2-0.5B-Instruct-GGUF
   MODEL_FILE: qwen2-0_5b-instruct-q8_0.gguf
 
 jobs:
-  download-model:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-      - name: Install huggingface-hub
-        run: pip install huggingface-hub
-      - name: Download model
-        run: huggingface-cli download ${{ env.REPO_ID }} ${{ env.MODEL_FILE }}
-      - name: Cache model
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/huggingface/hub
-          key: ${{ runner.os }}-model-${{ env.REPO_ID }}-${{ env.MODEL_FILE }}
-
-  build-linux:
-    needs: download-model
-    runs-on: ubuntu-latest
+  # Combined job for Linux, Windows, and macOS using a matrix strategy
+  build-and-test:
+    runs-on: ${{ matrix.os }}
     strategy:
+      # Don't cancel other jobs in the matrix if one fails
+      fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: "recursive"
-          
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: 'pip'
-      - name: Restore model cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/huggingface/hub
-          key: ${{ runner.os }}-model-${{ env.REPO_ID }}-${{ env.MODEL_FILE }}
-      - name: Install dependencies (Linux/MacOS)
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install uv
-          python -m uv pip install -e .[all] --verbose
-        shell: bash
-      - name: Test with pytest
-        run: |
-          python -m pytest
+        os: [ubuntu-latest, windows-latest, macos-13]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
-  build-windows:
-    needs: download-model
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: "recursive"
-          
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          # Use setup-python's built-in pip caching
           cache: 'pip'
 
-      - name: Restore model cache
+      - name: Cache HuggingFace model
+        # Give this step an id to reference its output below
+        id: model-cache
         uses: actions/cache@v4
         with:
           path: ~/.cache/huggingface/hub
           key: ${{ runner.os }}-model-${{ env.REPO_ID }}-${{ env.MODEL_FILE }}
 
-      - name: Install dependencies (Windows)
+      - name: Download model if not cached
+        # Only run this step if the cache was not found
+        if: steps.model-cache.outputs.cache-hit != 'true'
+        run: |
+          pip install huggingface-hub
+          huggingface-cli download ${{ env.REPO_ID }} ${{ env.MODEL_FILE }}
+        shell: bash
+
+      - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install uv
           python -m uv pip install -e .[all] --verbose
-        shell: cmd
-          
-      - name: Test with pytest
-        run: |
-          python -m pytest
-
-  build-macos:
-    needs: download-model
-    runs-on: macos-13
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: "recursive"
-          
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: 'pip'
-
-      - name: System Info
-        run: |
-          uname -a
-          sysctl -n machdep.cpu.brand_string
-          python3 -c "import platform; print(platform.machine(), platform.architecture())"
+        # FIX: Simplified shell to bash for all OSes
+        shell: bash
 
-      - name: Restore model cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/huggingface/hub
-          key: ${{ runner.os }}-model-${{ env.REPO_ID }}-${{ env.MODEL_FILE }}
-          
-      - name: Install dependencies (Linux/MacOS)
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install uv
-          python3 -m uv pip install -e .[all] --verbose
-          CMAKE_ARGS="-DLLAMA_METAL=off" python3 -m uv pip install .[all] --verbose
+      - name: Install dependencies (macOS non-Metal)
+        # Apply special compilation flags for the non-Metal macOS build
+        if: runner.os == 'macOS'
+        run: CMAKE_ARGS="-DLLAMA_METAL=off" python3 -m uv pip install .[all] --verbose
         shell: bash
 
       - name: Test with pytest
-        run: |
-          python3 -m pytest
+        run: python -m pytest
+        # FIX: Simplified shell to bash for all OSes
+        shell: bash
 
+  # Dedicated job for macOS with Metal support
   build-macos-metal:
-    needs: download-model
     runs-on: macos-13
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: "recursive"
-          
+
       - name: Set up Python 3.9
         uses: actions/setup-python@v5
         with:
           python-version: "3.9"
+          cache: 'pip'
 
       - name: System Info
         run: |
           uname -a
           sysctl -n machdep.cpu.brand_string
           python3 -c "import platform; print(platform.machine(), platform.architecture())"
+        shell: bash
 
-      - name: Restore model cache
+      - name: Cache HuggingFace model
+        id: model-cache
         uses: actions/cache@v4
         with:
           path: ~/.cache/huggingface/hub
-          key: ${{ runner.os }}-model-${{ env.REPO_ID }}-${{ env.MODEL_FILE }}
+          # Use a distinct key to avoid cache conflicts
+          key: ${{ runner.os }}-metal-model-${{ env.REPO_ID }}-${{ env.MODEL_FILE }}
 
-      - name: Install dependencies
+      - name: Download model if not cached
+        if: steps.model-cache.outputs.cache-hit != 'true'
+        run: |
+          pip install huggingface-hub
+          huggingface-cli download ${{ env.REPO_ID }} ${{ env.MODEL_FILE }}
+        shell: bash
+
+      - name: Install dependencies (macOS Metal)
         run: |
           python3 -m pip install --upgrade pip
           CMAKE_ARGS="-DLLAMA_METAL=on" python3 -m pip install .[all] --verbose
         shell: bash
 
       - name: Test with pytest
-        run: |
-          python3 -m pytest
+        run: python3 -m pytest
+        shell: bash