Skip to content

Commit

Permalink
Merged revision(s) 21619 from trunk/OpenMPT:
Browse files Browse the repository at this point in the history
[Fix] build: CI: GitHub: macOS: Fix GitHub Homebrew screwup on macOS 12.
........


git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@21620 56274372-70c3-4bfc-bfc3-4c3a0b034d27
  • Loading branch information
manxorist committed Sep 19, 2024
1 parent 123acdf commit 603d8aa
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/macOS-Autotools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
runs-on: ${{matrix.host}}
steps:
- uses: actions/checkout@v4
- name: update Homebrew
run: brew update
- name: fixup GitHub Homebrew swiftlint breakage
if: ${{ matrix.host == 'macos-12' }}
run: brew pin swiftlint
Expand All @@ -31,15 +33,17 @@ jobs:
run: brew pin xcbeautify
- name: fixup GitHub Homebrew go breakage
if: ${{ matrix.host == 'macos-12' }}
run: brew unlink [email protected]
run: brew unlink [email protected] && brew unlink go && brew link --overwrite go
- name: fixup GitHub Homebrew node breakage
if: ${{ matrix.host == 'macos-12' }}
run: brew unlink node@18 && brew unlink node && brew link --overwrite node
- name: fixup GitHub Homebrew python breakage
if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
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 autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
- name: selecting Xcode version
run: sudo xcode-select --switch /Applications/Xcode_${{matrix.compiler}}.app
- name: setup parallel make
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/macOS-Makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ jobs:
runs-on: ${{matrix.host}}
steps:
- uses: actions/checkout@v4
- name: update Homebrew
run: brew update
- name: fixup GitHub Homebrew swiftlint breakage
if: ${{ matrix.host == 'macos-12' }}
run: brew pin swiftlint
Expand All @@ -79,15 +81,17 @@ jobs:
run: brew pin xcbeautify
- name: fixup GitHub Homebrew go breakage
if: ${{ matrix.host == 'macos-12' }}
run: brew unlink [email protected]
run: brew unlink [email protected] && brew unlink go && brew link --overwrite go
- name: fixup GitHub Homebrew node breakage
if: ${{ matrix.host == 'macos-12' }}
run: brew unlink node@18 && brew unlink node && brew link --overwrite node
- name: fixup GitHub Homebrew python breakage
if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
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 autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
- name: selecting Xcode version
run: sudo xcode-select --switch /Applications/Xcode_${{matrix.compiler}}.app
- name: setup parallel make
Expand Down

0 comments on commit 603d8aa

Please sign in to comment.