From 4c85199cb25eaca65d57f6ccce4651eebabfdfb4 Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Wed, 8 Apr 2026 11:28:51 -0700 Subject: [PATCH 1/3] setup-macos: Re-enable installation of imagemagick Bug: https://github.com/AOMediaCodec/libavif/issues/3172 --- .github/actions/setup-macos/action.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/setup-macos/action.yml b/.github/actions/setup-macos/action.yml index 82c6dcd22a..617536c23a 100644 --- a/.github/actions/setup-macos/action.yml +++ b/.github/actions/setup-macos/action.yml @@ -60,9 +60,7 @@ runs: - name: Install imagemagick # imagemagick is used in sh tests (not gtest tests) but we assume that no tests are run by the CI # if gtest is off - # TODO: issue #3172 - Disable temporarily. - # if: ${{ inputs.gtest != 'OFF' }} - if: false + if: ${{ inputs.gtest != 'OFF' }} run: echo "AVIF_MAC_LIBRARIES=${{ env.AVIF_MAC_LIBRARIES }} imagemagick" >> "$GITHUB_ENV" shell: bash - name: Install gtest From ef5015d7af352a6e9a75a1e161dea671c6bba282 Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Wed, 8 Apr 2026 11:40:29 -0700 Subject: [PATCH 2/3] Install imagemagick-full instead of imagemagick Not sure if this is what the "Caveats" message suggests: ==> Caveats ==> imagemagick imagemagick-full includes additional tools and libraries that are not included in the regular imagemagick formula. --- .github/actions/setup-macos/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-macos/action.yml b/.github/actions/setup-macos/action.yml index 617536c23a..c7af2eb855 100644 --- a/.github/actions/setup-macos/action.yml +++ b/.github/actions/setup-macos/action.yml @@ -61,7 +61,7 @@ runs: # imagemagick is used in sh tests (not gtest tests) but we assume that no tests are run by the CI # if gtest is off if: ${{ inputs.gtest != 'OFF' }} - run: echo "AVIF_MAC_LIBRARIES=${{ env.AVIF_MAC_LIBRARIES }} imagemagick" >> "$GITHUB_ENV" + run: echo "AVIF_MAC_LIBRARIES=${{ env.AVIF_MAC_LIBRARIES }} imagemagick-full" >> "$GITHUB_ENV" shell: bash - name: Install gtest if: ${{ inputs.gtest == 'SYSTEM' }} From 18b2732f100fcbcdb5a3c91f29895fabaebfbb7d Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Wed, 8 Apr 2026 18:26:36 -0700 Subject: [PATCH 3/3] Go back to installing imagemagick --- .github/actions/setup-macos/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-macos/action.yml b/.github/actions/setup-macos/action.yml index c7af2eb855..617536c23a 100644 --- a/.github/actions/setup-macos/action.yml +++ b/.github/actions/setup-macos/action.yml @@ -61,7 +61,7 @@ runs: # imagemagick is used in sh tests (not gtest tests) but we assume that no tests are run by the CI # if gtest is off if: ${{ inputs.gtest != 'OFF' }} - run: echo "AVIF_MAC_LIBRARIES=${{ env.AVIF_MAC_LIBRARIES }} imagemagick-full" >> "$GITHUB_ENV" + run: echo "AVIF_MAC_LIBRARIES=${{ env.AVIF_MAC_LIBRARIES }} imagemagick" >> "$GITHUB_ENV" shell: bash - name: Install gtest if: ${{ inputs.gtest == 'SYSTEM' }}