Commitf4f17e6

authored

Merge pull request#28237 from meeseeksmachine/auto-backport-of-pr-28233-on-v3.9.x

Backport PR#28233 on branch v3.9.x (CI: Fix font install on macOS/Homebrew)

2 parentsfc1194e +6558e56 commitf4f17e6Copy full SHA for f4f17e6

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -160,10 +160,9 @@ jobs:`
`160`	`160`	`fi`
`161`	`161`	`;;`
`162`	`162`	`macOS)`
`163`		`- brew install ccache`
`164`		`- brew tap homebrew/cask-fonts`
`165`		`- brew install font-noto-sans-cjk ghostscript gobject-introspection gtk4 ninja`
`166`		`- brew install --cask inkscape`
	`163`	`+ brew update`
	`164`	`+ brew install ccache ghostscript gobject-introspection gtk4 ninja`
	`165`	`+ brew install --cask font-noto-sans-cjk inkscape`
`167`	`166`	`;;`
`168`	`167`	`esac`
`169`	`168`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,10 +119,10 @@ stages:`
`119`	`119`	`texlive-xetex`
`120`	`120`	`;;`
`121`	`121`	`Darwin)`
	`122`	`+ brew update`
`122`	`123`	`brew install --cask xquartz`
`123`	`124`	`brew install ccache ffmpeg imagemagick mplayer ninja pkg-config`
`124`		`- brew tap homebrew/cask-fonts`
`125`		`- brew install font-noto-sans-cjk-sc`
	`125`	`+ brew install --cask font-noto-sans-cjk-sc`
`126`	`126`	`;;`
`127`	`127`	`Windows_NT)`
`128`	`128`	`choco install ninja`

Comments

(0)