More changes for YAML

microsoft · Sep 4, 2024 · 7c084c3 · 7c084c3
1 parent 59e819c
commit 7c084c3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -131,8 +131,7 @@ jobs:
             echo "::error Unknown architecture/build-type triplet mapping"
         }
 
-    - if: ${{ !contains(matrix.build_type, 'arm64ec') }}
-      uses: lukka/run-vcpkg@v11
+    - uses: lukka/run-vcpkg@v11
       with:
         runVcpkgInstall: true
         vcpkgJsonGlob: '**/build/vcpkg.json'

diff --git a/.github/workflows/wsl.yml b/.github/workflows/wsl.yml
@@ -51,4 +51,4 @@ jobs:
 
     - name: 'Build'
       working-directory: ${{ github.workspace }}
-      run: cmake --build out\build\${{ matrix.build_type }}
+      run: cmake --build out/build/${{ matrix.build_type }}
diff --git a/build/vcpkg.json b/build/vcpkg.json
@@ -3,9 +3,17 @@
     "dependencies": [
       "directxmath",
       "directx-headers",
-      "openexr",
-      "libpng",
-      "libjpeg-turbo"
+      {
+        "name": "openexr",
+        "platform": "linux | (windows & !arm64ec)"
+      },
+      {
+        "name": "libpng",
+        "platform": "linux | (windows & !arm64ec)"
+      },
+      {
+        "name": "libjpeg-turbo",
+        "platform": "linux | (windows & !arm64ec)"
+      }
     ]
-  }
-
+}