Menu
▾
▴
[OMPT-svn-commit] OpenMPT r21620 - in branches/OpenMPT-1.31: . .github/workflows
|
From: <sv...@op...> - 2024-09-19 13:04:20
|
Author: manx Date: Thu Sep 19 15:04:08 2024 New Revision: 21620 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21620 Log: Merged revision(s) 21619 from trunk/OpenMPT: [Fix] build: CI: GitHub: macOS: Fix GitHub Homebrew screwup on macOS 12. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml Thu Sep 19 15:03:39 2024 (r21619) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml Thu Sep 19 15:04:08 2024 (r21620) @@ -23,6 +23,8 @@ 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 @@ -31,15 +33,17 @@ run: brew pin xcbeautify - name: fixup GitHub Homebrew go breakage if: ${{ matrix.host == 'macos-12' }} - run: brew unlink go@1.21 + run: brew unlink go@1.21 && 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 python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + - 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 Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Thu Sep 19 15:03:39 2024 (r21619) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Thu Sep 19 15:04:08 2024 (r21620) @@ -71,6 +71,8 @@ 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 @@ -79,15 +81,17 @@ run: brew pin xcbeautify - name: fixup GitHub Homebrew go breakage if: ${{ matrix.host == 'macos-12' }} - run: brew unlink go@1.21 + run: brew unlink go@1.21 && 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 python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + - 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 |
