Only OpenEXR fails for ARM64EC

microsoft · Sep 4, 2024 · 2b3984a · 2b3984a
1 parent 7c084c3
commit 2b3984a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,56 +36,43 @@ jobs:
         os: [windows-2019, windows-2022]
         build_type: [x64-Debug, x64-Release]
         arch: [amd64]
-        build_opts: [jpegpng]
         include:
           - os: windows-2019
             build_type: x86-Debug
             arch: amd64_x86
-            build_opts: jpegpng
           - os: windows-2019
             build_type: x86-Release
             arch: amd64_x86
-            build_opts: jpegpng
           - os: windows-2022
             build_type: x86-Debug
             arch: amd64_x86
-            build_opts: jpegpng
           - os: windows-2022
             build_type: x86-Release
             arch: amd64_x86
-            build_opts: jpegpng
           - os: windows-2022
             build_type: x64-Debug-Clang
             arch: amd64
-            build_opts: jpegpng
           - os: windows-2022
             build_type: x64-Release-Clang
             arch: amd64
-            build_opts: jpegpng
           - os: windows-2022
             build_type: x86-Debug-Clang
             arch: amd64_x86
-            build_opts: jpegpng
           - os: windows-2022
             build_type: x86-Release-Clang
             arch: amd64_x86
-            build_opts: jpegpng
           - os: windows-2022
             build_type: arm64-Debug
             arch: amd64_arm64
-            build_opts: jpegpng
           - os: windows-2022
             build_type: arm64-Release
             arch: amd64_arm64
-            build_opts: jpegpng
           - os: windows-2022
             build_type: arm64ec-Debug
             arch: amd64_arm64
-            build_opts: none
           - os: windows-2022
             build_type: arm64ec-Release
             arch: amd64_arm64
-            build_opts: none
 
     steps:
     - uses: actions/checkout@v4
@@ -140,14 +127,10 @@ jobs:
     - name: 'Configure CMake'
       working-directory: ${{ github.workspace }}
       run: >
-        cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=ON -DBUILD_TOOLS=OFF -DBUILD_SAMPLE=OFF ${env:BUILD_OPTION1} ${env:BUILD_OPTION2}
+        cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=ON -DBUILD_TOOLS=OFF -DBUILD_SAMPLE=OFF -DENABLE_LIBJPEG_SUPPORT=ON -DENABLE_LIBPNG_SUPPORT=ON
         -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
         -DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}"
 
-      env:
-        BUILD_OPTION1: ${{ matrix.build_opts == 'jpegpng' && '-DENABLE_LIBJPEG_SUPPORT=ON' || '-DENABLE_LIBJPEG_SUPPORT=OFF' }}
-        BUILD_OPTION2: ${{ matrix.build_opts == 'jpegpng' && '-DENABLE_LIBPNG_SUPPORT=ON' || '-DENABLE_LIBPNG_SUPPORT=OFF' }}
-
     - name: 'Build'
       working-directory: ${{ github.workspace }}
       run: cmake --build out\build\${{ matrix.build_type }}
diff --git a/.github/workflows/wsl.yml b/.github/workflows/wsl.yml
@@ -45,7 +45,7 @@ jobs:
     - name: 'Configure CMake'
       working-directory: ${{ github.workspace }}
       run: >
-        cmake --preset=${{ matrix.build_type }} -DENABLE_LIBJPEG_SUPPORT=ON -DENABLE_LIBPNG_SUPPORT=ON
+        cmake --preset=${{ matrix.build_type }} -DENABLE_OPENEXR_SUPPORT=ON -DENABLE_LIBJPEG_SUPPORT=ON -DENABLE_LIBPNG_SUPPORT=ON
         -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build"
         -DVCPKG_TARGET_TRIPLET="x64-linux"