Skip to content

Commit

Permalink
github CI: remove EXIV2_ENABLE_VIDEO
Browse files Browse the repository at this point in the history
This is already default.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
  • Loading branch information
neheb committed Feb 26, 2023
1 parent ae1381e commit a653043
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_linux_fuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
env:
CXX: clang++
run: |
cmake --preset linux-sanitizers -S . -B build -DCMAKE_BUILD_TYPE=Release -DEXIV2_BUILD_FUZZ_TESTS=ON -DEXIV2_BUILD_UNIT_TESTS=OFF -DEXIV2_ENABLE_VIDEO=ON
cmake --preset linux-sanitizers -S . -B build -DCMAKE_BUILD_TYPE=Release -DEXIV2_BUILD_FUZZ_TESTS=ON -DEXIV2_BUILD_UNIT_TESTS=OFF
cmake --build build --parallel
- name: Fuzz
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_linux_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Build
run: |
cmake --preset base_linux -S . -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} -DEXIV2_ENABLE_VIDEO=ON
cmake --preset base_linux -S . -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}}
cmake --build build-base_linux --parallel
- name: Install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on_PR_linux_special_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Build
run: |
cmake --preset linux-coverage -S . -B build -DEXIV2_ENABLE_VIDEO=ON
cmake --preset linux-coverage -S . -B build
cmake --build build --parallel
- name: Tests + Upload coverage
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- name: Build
run: |
cmake --preset linux-sanitizers -S . -B build -DEXIV2_ENABLE_VIDEO=ON
cmake --preset linux-sanitizers -S . -B build
cmake --build build --parallel
- name: Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_mac_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Build
run: |
cmake --preset base_mac -S . -B build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} -DEXIV2_ENABLE_VIDEO=ON
cmake --preset base_mac -S . -B build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}}
cmake --build build --parallel
- name: Install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_PR_mac_special_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Build
run: |
cmake --preset base_mac -S . -B build -DEXIV2_TEAM_USE_SANITIZERS=ON -DEXIV2_ENABLE_VIDEO=ON
cmake --preset base_mac -S . -B build -DEXIV2_TEAM_USE_SANITIZERS=ON
cmake --build build --parallel
- name: Tests
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/on_PR_windows_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Build
run: |
cmake --preset base_windows -S . -B build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} -DEXIV2_ENABLE_VIDEO=ON
cmake --preset base_windows -S . -B build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.shared_libraries}}
cmake --build build --parallel
- name: Install
Expand Down Expand Up @@ -135,7 +135,6 @@ jobs:
-DBUILD_SHARED_LIBS=${{matrix.shared_libraries}} \
-DCONAN_AUTO_INSTALL=OFF \
-DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF \
-DEXIV2_ENABLE_VIDEO=ON \
-DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \
-S . -B build && \
cmake --build build --parallel
Expand Down Expand Up @@ -190,7 +189,6 @@ jobs:
-DEXIV2_BUILD_SAMPLES=OFF \
-DEXIV2_BUILD_UNIT_TESTS=OFF \
-DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF \
-DEXIV2_ENABLE_VIDEO=ON \
-S . -B build && \
cmake --build build --parallel
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/on_push_BasicWinLinMac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Build
run: |
cmake --preset win-release -S . -B build -DEXIV2_ENABLE_VIDEO=ON
cmake --preset win-release -S . -B build
cmake --build build --parallel
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- name: build and compile
run: |
cmake --preset linux-release-NoConan -S . -B build -DEXIV2_ENABLE_VIDEO=ON
cmake --preset linux-release-NoConan -S . -B build
cmake --build build --parallel
- name: Test
Expand All @@ -107,7 +107,7 @@ jobs:
- name: build and compile
run: |
cmake --preset base_mac -S . -B build -DEXIV2_ENABLE_VIDEO=ON
cmake --preset base_mac -S . -B build
cmake --build build --parallel
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_push_ExtraJobsForMain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Build
run: |
cmake --preset linux-coverage -S . -B build -DEXIV2_ENABLE_VIDEO=ON
cmake --preset linux-coverage -S . -B build
cmake --build build
- name: Tests + Upload coverage
Expand Down

0 comments on commit a653043

Please sign in to comment.