From ca262a75b3cbdb3097fc2a060d0b4bd6e1d14f42 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 23 Feb 2023 21:35:14 -0800 Subject: [PATCH] github CI: remove EXIV2_ENABLE_VIDEO This is already default. Signed-off-by: Rosen Penev --- .github/workflows/on_PR_linux_fuzz.yml | 2 +- .github/workflows/on_PR_linux_matrix.yml | 2 +- .github/workflows/on_PR_linux_special_builds.yml | 4 ++-- .github/workflows/on_PR_mac_matrix.yml | 2 +- .github/workflows/on_PR_mac_special_builds.yml | 2 +- .github/workflows/on_PR_windows_matrix.yml | 4 +--- .github/workflows/on_push_BasicWinLinMac.yml | 6 +++--- .github/workflows/on_push_ExtraJobsForMain.yml | 2 +- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/on_PR_linux_fuzz.yml b/.github/workflows/on_PR_linux_fuzz.yml index 396ec0b9a2..c2e14a32c3 100644 --- a/.github/workflows/on_PR_linux_fuzz.yml +++ b/.github/workflows/on_PR_linux_fuzz.yml @@ -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 diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml index 68334e10af..eb2c263816 100644 --- a/.github/workflows/on_PR_linux_matrix.yml +++ b/.github/workflows/on_PR_linux_matrix.yml @@ -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 diff --git a/.github/workflows/on_PR_linux_special_builds.yml b/.github/workflows/on_PR_linux_special_builds.yml index 60433c6374..988b60a33d 100644 --- a/.github/workflows/on_PR_linux_special_builds.yml +++ b/.github/workflows/on_PR_linux_special_builds.yml @@ -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 @@ -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 diff --git a/.github/workflows/on_PR_mac_matrix.yml b/.github/workflows/on_PR_mac_matrix.yml index 4dbdc123d2..664693d1ba 100644 --- a/.github/workflows/on_PR_mac_matrix.yml +++ b/.github/workflows/on_PR_mac_matrix.yml @@ -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 diff --git a/.github/workflows/on_PR_mac_special_builds.yml b/.github/workflows/on_PR_mac_special_builds.yml index 75ff507d76..f15a97bfb1 100644 --- a/.github/workflows/on_PR_mac_special_builds.yml +++ b/.github/workflows/on_PR_mac_special_builds.yml @@ -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 diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml index cb7aa0f21f..4d95daf4b9 100644 --- a/.github/workflows/on_PR_windows_matrix.yml +++ b/.github/workflows/on_PR_windows_matrix.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index dce2027348..368f64267f 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml index 5f0d2c3e65..4cfa7c0ff4 100644 --- a/.github/workflows/on_push_ExtraJobsForMain.yml +++ b/.github/workflows/on_push_ExtraJobsForMain.yml @@ -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