From 73aa991503b95d74b9387d293c828299782bf380 Mon Sep 17 00:00:00 2001 From: michaeldsmith <37905569+michaeldsmith@users.noreply.github.com> Date: Mon, 22 Apr 2024 08:28:36 -0700 Subject: [PATCH] restore tiff to vcpkg github workflow (#152) * restores tiff to vcpkg github workflow that was removed in #147 due to a security issue --- .github/workflows/windows_vcpkg_debug.yml | 14 ++++---------- .github/workflows/windows_vcpkg_release.yml | 14 ++++---------- vcpkg.json | 3 ++- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/.github/workflows/windows_vcpkg_debug.yml b/.github/workflows/windows_vcpkg_debug.yml index f2430c84..89848089 100644 --- a/.github/workflows/windows_vcpkg_debug.yml +++ b/.github/workflows/windows_vcpkg_debug.yml @@ -30,11 +30,8 @@ jobs: - name: install dependencies - openexr run: vcpkg install openexr - # disabling tiff due to security issue - # https://github.com/microsoft/vcpkg/issues/37871 - # https://github.com/microsoft/vcpkg/issues/37839 - # - name: install dependencies - tiff - # run: vcpkg install tiff + - name: install dependencies - tiff + run: vcpkg install tiff - name: check vcpkg install status run: vcpkg list @@ -69,11 +66,8 @@ jobs: - name: install dependencies - openexr run: vcpkg install openexr - # disabling tiff due to security issue - # https://github.com/microsoft/vcpkg/issues/37871 - # https://github.com/microsoft/vcpkg/issues/37839 -# - name: install dependencies - tiff - # run: vcpkg install tiff + - name: install dependencies - tiff + run: vcpkg install tiff - name: check vcpkg install status run: vcpkg list diff --git a/.github/workflows/windows_vcpkg_release.yml b/.github/workflows/windows_vcpkg_release.yml index 8b1b1152..1231023c 100644 --- a/.github/workflows/windows_vcpkg_release.yml +++ b/.github/workflows/windows_vcpkg_release.yml @@ -30,11 +30,8 @@ jobs: - name: install dependencies - openexr run: vcpkg install openexr:x64-windows - # disabling tiff due to security issue - # https://github.com/microsoft/vcpkg/issues/37871 - # https://github.com/microsoft/vcpkg/issues/37839 - #- name: install dependencies - tiff - # run: vcpkg install tiff:x64-windows + - name: install dependencies - tiff + run: vcpkg install tiff:x64-windows - name: check vcpkg install status run: vcpkg list @@ -69,11 +66,8 @@ jobs: - name: install dependencies - openexr run: vcpkg install openexr:x64-windows - # disabling tiff due to security issue - # https://github.com/microsoft/vcpkg/issues/37871 - # https://github.com/microsoft/vcpkg/issues/37839 - #- name: install dependencies - tiff - # run: vcpkg install tiff:x64-windows + - name: install dependencies - tiff + run: vcpkg install tiff:x64-windows - name: check vcpkg install status run: vcpkg list diff --git a/vcpkg.json b/vcpkg.json index bc7153a4..7b1adbc1 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,6 +3,7 @@ "version": "1.5.3", "dependencies": [ "imath", - "openexr" + "openexr", + "tiff" ] }