Skip to content

Commit 7c084c3

Browse files
committed
More changes for YAML
1 parent 59e819c commit 7c084c3

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

.github/workflows/test.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ jobs:
131131
echo "::error Unknown architecture/build-type triplet mapping"
132132
}
133133
134-
- if: ${{ !contains(matrix.build_type, 'arm64ec') }}
135-
uses: lukka/run-vcpkg@v11
134+
- uses: lukka/run-vcpkg@v11
136135
with:
137136
runVcpkgInstall: true
138137
vcpkgJsonGlob: '**/build/vcpkg.json'

.github/workflows/wsl.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ jobs:
5151
5252
- name: 'Build'
5353
working-directory: ${{ github.workspace }}
54-
run: cmake --build out\build\${{ matrix.build_type }}
54+
run: cmake --build out/build/${{ matrix.build_type }}

build/vcpkg.json

+13-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@
33
"dependencies": [
44
"directxmath",
55
"directx-headers",
6-
"openexr",
7-
"libpng",
8-
"libjpeg-turbo"
6+
{
7+
"name": "openexr",
8+
"platform": "linux | (windows & !arm64ec)"
9+
},
10+
{
11+
"name": "libpng",
12+
"platform": "linux | (windows & !arm64ec)"
13+
},
14+
{
15+
"name": "libjpeg-turbo",
16+
"platform": "linux | (windows & !arm64ec)"
17+
}
918
]
10-
}
11-
19+
}

0 commit comments

Comments
 (0)