Skip to content

Commit f9b4832

Browse files
michaeldsmithmichaeldsmith
committed
disable openexr2 and enable tests
1 parent 577ab84 commit f9b4832

File tree

3 files changed

+9
-115
lines changed

3 files changed

+9
-115
lines changed

‎.github/workflows/windows_arm_debug.yml‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -20,59 +20,6 @@ env:
2020

2121
jobs:
2222

23-
build-openexr2:
24-
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
25-
# You can convert this to a matrix build if you need cross-platform coverage.
26-
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
27-
runs-on: windows-11-arm
28-
29-
steps:
30-
31-
- name: install dependencies - zlib
32-
run: |
33-
cd ..
34-
git clone https://github.com/madler/zlib.git &&
35-
cd zlib &&
36-
mkdir build &&
37-
mkdir install &&
38-
cd build &&
39-
cmake .. -D"CMAKE_INSTALL_PREFIX=../install" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} &&
40-
cmake --build . --config ${{env.BUILD_TYPE}} &&
41-
cmake --build . --target install --config ${{env.BUILD_TYPE}}
42-
43-
- name: install dependencies - openexr
44-
run: |
45-
cd ..
46-
git clone https://github.com/AcademySoftwareFoundation/openexr.git &&
47-
cd openexr &&
48-
git checkout RB-2.5 &&
49-
mkdir build &&
50-
mkdir install &&
51-
cd build &&
52-
cmake .. -D"CMAKE_INSTALL_PREFIX=../install" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTING=OFF -DOPENEXR_BUILD_TOOLS=OFF -DOPENEXR_INSTALL_EXAMPLES=OFF -D "CMAKE_PREFIX_PATH=${{github.workspace}}/../zlib/install/" &&
53-
cmake --build . --config ${{env.BUILD_TYPE}} &&
54-
cmake --build . --target install --config ${{env.BUILD_TYPE}}
55-
56-
- uses: actions/checkout@v4
57-
58-
- name: Configure CMake
59-
# # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
60-
# # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
61-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -D "CMAKE_PREFIX_PATH=${{github.workspace}}/../openexr/install/;${{github.workspace}}/../zlib/install/"
62-
63-
- name: Build
64-
# Build your program with the given configuration
65-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
66-
67-
- name: Install
68-
# Build your program with the given configuration
69-
run: cmake --build ${{github.workspace}}/build --target install --config ${{env.BUILD_TYPE}}
70-
working-directory: ${{github.workspace}}
71-
72-
# - name: Test
73-
# working-directory: ${{github.workspace}}/build
74-
# run: ctest -V --output-on-failure -C ${{env.BUILD_TYPE}}
75-
7623
build-openexr3:
7724
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
7825
# You can convert this to a matrix build if you need cross-platform coverage.

‎.github/workflows/windows_arm_release.yml‎

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -20,59 +20,6 @@ env:
2020

2121
jobs:
2222

23-
build-openexr2:
24-
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
25-
# You can convert this to a matrix build if you need cross-platform coverage.
26-
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
27-
runs-on: windows-11-arm
28-
29-
steps:
30-
31-
- name: install dependencies - zlib
32-
run: |
33-
cd ..
34-
git clone https://github.com/madler/zlib.git &&
35-
cd zlib &&
36-
mkdir build &&
37-
mkdir install &&
38-
cd build &&
39-
cmake .. -D"CMAKE_INSTALL_PREFIX=../install" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} &&
40-
cmake --build . --config ${{env.BUILD_TYPE}} &&
41-
cmake --build . --target install --config ${{env.BUILD_TYPE}}
42-
43-
- name: install dependencies - openexr
44-
run: |
45-
cd ..
46-
git clone https://github.com/AcademySoftwareFoundation/openexr.git &&
47-
cd openexr &&
48-
git checkout RB-2.5 &&
49-
mkdir build &&
50-
mkdir install &&
51-
cd build &&
52-
cmake .. -D"CMAKE_INSTALL_PREFIX=../install" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTING=OFF -DOPENEXR_BUILD_TOOLS=OFF -DOPENEXR_INSTALL_EXAMPLES=OFF -D "CMAKE_PREFIX_PATH=${{github.workspace}}/../zlib/install/" &&
53-
cmake --build . --config ${{env.BUILD_TYPE}} &&
54-
cmake --build . --target install --config ${{env.BUILD_TYPE}}
55-
56-
- uses: actions/checkout@v4
57-
58-
- name: Configure CMake
59-
# # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
60-
# # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
61-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -D "CMAKE_PREFIX_PATH=${{github.workspace}}/../openexr/install/;${{github.workspace}}/../zlib/install/"
62-
63-
- name: Build
64-
# Build your program with the given configuration
65-
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
66-
67-
- name: Install
68-
# Build your program with the given configuration
69-
run: cmake --build ${{github.workspace}}/build --target install --config ${{env.BUILD_TYPE}}
70-
working-directory: ${{github.workspace}}
71-
72-
# - name: Test
73-
# working-directory: ${{github.workspace}}/build
74-
# run: ctest -V --output-on-failure -C ${{env.BUILD_TYPE}}
75-
7623
build-openexr3:
7724
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
7825
# You can convert this to a matrix build if you need cross-platform coverage.
@@ -134,6 +81,6 @@ jobs:
13481
run: cmake --build ${{github.workspace}}/build --target install --config ${{env.BUILD_TYPE}}
13582
working-directory: ${{github.workspace}}
13683

137-
# - name: Test
138-
# working-directory: ${{github.workspace}}/build
139-
# run: ctest -V --output-on-failure -C ${{env.BUILD_TYPE}}
84+
- name: Test
85+
working-directory: ${{github.workspace}}/build
86+
run: ctest -V --output-on-failure -C ${{env.BUILD_TYPE}}

‎.github/workflows/windows_arm_vcpkg_release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929
steps:
3030

3131
- name: install dependencies - imath
32-
run: vcpkg install imath:x64-windows
32+
run: vcpkg install imath
3333

3434
- name: install dependencies - openexr
35-
run: vcpkg install openexr:x64-windows
35+
run: vcpkg install openexr
3636

3737
- name: install dependencies - tiff
38-
run: vcpkg install tiff:x64-windows
38+
run: vcpkg install tiff
3939

4040
- name: check vcpkg install status
4141
run: vcpkg list
@@ -56,6 +56,6 @@ jobs:
5656
run: cmake --build ${{github.workspace}}/build --target install --config ${{env.BUILD_TYPE}}
5757
working-directory: ${{github.workspace}}
5858

59-
# - name: Test
60-
# working-directory: ${{github.workspace}}/build
61-
# run: ctest -V --output-on-failure -C ${{env.BUILD_TYPE}}
59+
- name: Test
60+
working-directory: ${{github.workspace}}/build
61+
run: ctest -V --output-on-failure -C ${{env.BUILD_TYPE}}

0 commit comments

Comments
 (0)