Skip to content

Commit 6b91ba2

Browse files
committed
Disable jpeg/png with arm64ec
1 parent 6d0fd33 commit 6b91ba2

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

.github/workflows/test.yml

+17-1
Original file line numberDiff line numberDiff line change
@@ -36,43 +36,56 @@ jobs:
3636
os: [windows-2019, windows-2022]
3737
build_type: [x64-Debug, x64-Release]
3838
arch: [amd64]
39+
build_opts: [jpegpng]
3940
include:
4041
- os: windows-2019
4142
build_type: x86-Debug
4243
arch: amd64_x86
44+
build_opts: jpegpng
4345
- os: windows-2019
4446
build_type: x86-Release
4547
arch: amd64_x86
48+
build_opts: jpegpng
4649
- os: windows-2022
4750
build_type: x86-Debug
4851
arch: amd64_x86
52+
build_opts: jpegpng
4953
- os: windows-2022
5054
build_type: x86-Release
5155
arch: amd64_x86
56+
build_opts: jpegpng
5257
- os: windows-2022
5358
build_type: x64-Debug-Clang
5459
arch: amd64
60+
build_opts: jpegpng
5561
- os: windows-2022
5662
build_type: x64-Release-Clang
5763
arch: amd64
64+
build_opts: jpegpng
5865
- os: windows-2022
5966
build_type: x86-Debug-Clang
6067
arch: amd64_x86
68+
build_opts: jpegpng
6169
- os: windows-2022
6270
build_type: x86-Release-Clang
6371
arch: amd64_x86
72+
build_opts: jpegpng
6473
- os: windows-2022
6574
build_type: arm64-Debug
6675
arch: amd64_arm64
76+
build_opts: jpegpng
6777
- os: windows-2022
6878
build_type: arm64-Release
6979
arch: amd64_arm64
80+
build_opts: jpegpng
7081
- os: windows-2022
7182
build_type: arm64ec-Debug
7283
arch: amd64_arm64
84+
build_opts: none
7385
- os: windows-2022
7486
build_type: arm64ec-Release
7587
arch: amd64_arm64
88+
build_opts: none
7689

7790
steps:
7891
- uses: actions/checkout@v4
@@ -127,9 +140,12 @@ jobs:
127140
- name: 'Configure CMake'
128141
working-directory: ${{ github.workspace }}
129142
run: >
130-
cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=ON -DBUILD_TOOLS=OFF -DBUILD_SAMPLE=OFF -DENABLE_LIBJPEG_SUPPORT=ON -DENABLE_LIBPNG_SUPPORT=ON
143+
cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=ON -DBUILD_TOOLS=OFF -DBUILD_SAMPLE=OFF $BUILD_OPTION1 $BUILD_OPTION2
131144
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
132145
-DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}"
146+
env:
147+
BUILD_OPTION1: ${{ matrix.build_opts == 'jpegpng' && '-DENABLE_LIBJPEG_SUPPORT=ON' || '' }}
148+
BUILD_OPTION2: ${{ matrix.build_opts == 'jpegpng' && '-DENABLE_LIBPNG_SUPPORT=ON' || '' }}
133149

134150
- name: 'Build'
135151
working-directory: ${{ github.workspace }}

0 commit comments

Comments
 (0)