Skip to content

Commit

Permalink
Merged revision(s) 21621 from branches/OpenMPT-1.30:
Browse files Browse the repository at this point in the history
[Fix] build: CI: GitHub: macOS: Fix GitHub Homebrew screwup on macOS 12. See r21619.
........


git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.29@21622 56274372-70c3-4bfc-bfc3-4c3a0b034d27
  • Loading branch information
manxorist committed Sep 19, 2024
1 parent 28ac83c commit b7e482f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/macOS-12-Makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,22 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: update Homebrew
run: brew update
- name: fixup GitHub Homebrew swiftlint breakage
run: brew pin swiftlint
- name: fixup GitHub Homebrew xcbeautify breakage
run: brew pin xcbeautify
- name: fixup GitHub Homebrew go breakage
run: brew unlink [email protected]
run: brew unlink [email protected] && brew unlink go && brew link --overwrite go
- name: fixup GitHub Homebrew node breakage
run: brew unlink node@18 && brew unlink node && brew link --overwrite node
- name: fixup GitHub Homebrew python breakage
run: brew unlink [email protected] && brew unlink [email protected] && brew link --overwrite [email protected] && brew link --overwrite [email protected]
- name: upgrade packages
run: brew upgrade
- name: install dependencies
run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
- name: setup parallel make
run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
- name: make
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/macOS-13-Makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: update Homebrew
run: brew update
- name: fixup GitHub Homebrew python breakage
run: brew unlink [email protected] && brew unlink [email protected] && brew link --overwrite [email protected] && brew link --overwrite [email protected]
- name: upgrade packages
run: brew upgrade
- name: install dependencies
run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
- name: setup parallel make
run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
- name: make
Expand Down

0 comments on commit b7e482f

Please sign in to comment.