update

madebr · Dec 29, 2024 · 5e6248e · 5e6248e
1 parent ad5d7d7
commit 5e6248e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 32 deletions.
diff --git a/.github/workflows/CMake-MSVC-noyasm.yml b/.github/workflows/CMake-MSVC-noyasm.yml
diff --git a/.github/workflows/CMake-MSVC.yml b/.github/workflows/CMake-MSVC.yml
@@ -55,16 +55,19 @@ jobs:
         os: [windows-2022, windows-2019]
         arch: [x86, x64, amd64_arm, amd64_arm64]
         shared: [ON, OFF]
+        yasm: [true, false]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - name: Restore yasm
+        if: ${{ matrix.yasm }}
         uses: actions/cache/restore@v4
         with:
           path: |
             ${{ github.workspace }}/yasm
           key: yasm
       - name: Add yasm to PATH
+        if: ${{ matrix.yasm }}
         run: echo "${{ github.workspace }}/yasm/bin" >> %GITHUB_PATH%"
       - name: Setup vcvars
         uses: ilammy/msvc-dev-cmd@v1
@@ -74,6 +77,6 @@ jobs:
       - name: Setup ninja
         uses: ./.github/actions/setup-ninja
       - name: CMake (configure)
-        run: cmake -S ports/cmake -B build -GNinja -DYASM_ASSEMBLER=${{ github.workspace }}/yasm/bin/vsyasm.exe -DBUILD_SHARED_LIBS=${{ matrix.shared }}
+        run: cmake -S ports/cmake -B build -GNinja ${{ (matrix.yasm && format('-DYASM_ASSEMBLER={0}/yasm/bin/vsyasm.exe', github.workspace)) || '' }} -DBUILD_SHARED_LIBS=${{ matrix.shared }}
       - name: CMake (Build)
         run: cmake --build build --verbose