From 6558e560947bfcfcd2c1bebd0bec788aecbddc0c Mon Sep 17 00:00:00 2001 From: Kyle Sunden Date: Thu, 16 May 2024 13:26:22 -0500 Subject: [PATCH] Backport PR #28233: CI: Fix font install on macOS/Homebrew --- .github/workflows/tests.yml | 7 +++---- azure-pipelines.yml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 126693beafa7..daa07e62b2e5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -160,10 +160,9 @@ jobs: fi ;; macOS) - brew install ccache - brew tap homebrew/cask-fonts - brew install font-noto-sans-cjk ghostscript gobject-introspection gtk4 ninja - brew install --cask inkscape + brew update + brew install ccache ghostscript gobject-introspection gtk4 ninja + brew install --cask font-noto-sans-cjk inkscape ;; esac diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bf055d0eaa16..4c50c543846a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -119,10 +119,10 @@ stages: texlive-xetex ;; Darwin) + brew update brew install --cask xquartz brew install ccache ffmpeg imagemagick mplayer ninja pkg-config - brew tap homebrew/cask-fonts - brew install font-noto-sans-cjk-sc + brew install --cask font-noto-sans-cjk-sc ;; Windows_NT) choco install ninja