[shortfin] Merge Windows and Linux workflows

nod-ai · Nov 14, 2024 · 1644f19 · 1644f19
1 parent 9d45921
commit 1644f19
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 109 deletions.
diff --git a/...ub/workflows/ci_linux_x64-libshortfin.yml → .github/workflows/ci-libshortfin.yml b/...ub/workflows/ci_linux_x64-libshortfin.yml → .github/workflows/ci-libshortfin.yml
@@ -10,13 +10,13 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - '.github/workflows/ci_linux_x64-libshortfin.yml'
+      - '.github/workflows/ci-libshortfin.yml'
       - 'shortfin/**'
   push:
     branches:
       - main
     paths:
-      - '.github/workflows/ci_linux_x64-libshortfin.yml'
+      - '.github/workflows/ci-libshortfin.yml'
       - 'shortfin/**'
 
 permissions:
@@ -36,18 +36,31 @@ env:
 
 jobs:
   build-and-test:
-    name: Build and test
-    runs-on: ubuntu-24.04
+    name: "Build and test :: ${{ matrix.platform }} :: ${{ matrix.python-version }}"
+    runs-on: ${{ matrix.runs-on }}
     strategy:
       matrix:
         python-version: ["3.10", "3.11", "3.12"]
+        include:
+          - name: ubuntu-24.04
+            runs-on: ubuntu-24.04
+            cmake-options:
+              -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DCMAKE_LINKER_TYPE=LLD
+          - name: windows-2022
+            runs-on: windows-2022
+            cmake-options:
 
     steps:
-    - name: Install dependencies
+    - name: (Linux) Install dependencies
+      if: "runner.os == 'Linux'"
       run: |
         sudo apt update
         sudo apt install clang lld cmake ninja-build
 
+    - name: (Windows) Configure MSVC
+      if: "runner.os == 'Windows'"
+      uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
@@ -70,7 +83,7 @@ jobs:
         git submodule update --init --depth 1 -- third_party/googletest
         git submodule update --init --depth 1 -- third_party/hip-build-deps/
 
-    - name: Setup Python ${{ matrix.python-version }}
+    - name: "Setup Python :: ${{ matrix.platform }} :: ${{ matrix.python-version }}"
       uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
       with:
         python-version: ${{ matrix.python-version }}
@@ -85,17 +98,16 @@ jobs:
 
     - name: Build shortfin (full)
       working-directory: ${{ env.LIBSHORTFIN_DIR }}
+      shell: bash
       run: |
         mkdir build
         cmake -GNinja \
           -S. \
           -Bbuild \
-          -DCMAKE_C_COMPILER=clang-18 \
-          -DCMAKE_CXX_COMPILER=clang++-18 \
-          -DCMAKE_LINKER_TYPE=LLD \
           -DSHORTFIN_BUNDLE_DEPS=ON \
           -DSHORTFIN_IREE_SOURCE_DIR="${{ env.IREE_REPO_DIR }}" \
-          -DSHORTFIN_BUILD_PYTHON_BINDINGS=ON
+          -DSHORTFIN_BUILD_PYTHON_BINDINGS=ON \
+          ${{matrix.driver-options}}
         cmake --build build --target all
         pip install -v -e build/
 
@@ -105,7 +117,8 @@ jobs:
         ctest --timeout 30 --output-on-failure --test-dir build
         pytest -s
 
-    - name: Build shortfin (host-only)
+    - name: "Build shortfin (host-only) :: ${{ matrix.platform }} :: ${{ matrix.python-version }}"
+      if: "runner.os == 'Linux'"
       working-directory: ${{ env.LIBSHORTFIN_DIR }}
       run: |
         mkdir build-host-only

diff --git a/.github/workflows/ci_windows_x64-libshortfin.yml b/.github/workflows/ci_windows_x64-libshortfin.yml