From 603d8aad677e0fde7b1412bb6726eb7d1c18fd80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Thu, 19 Sep 2024 13:04:08 +0000 Subject: [PATCH] Merged revision(s) 21619 from trunk/OpenMPT: [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 --- .github/workflows/macOS-Autotools.yml | 8 ++++++-- .github/workflows/macOS-Makefile.yml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macOS-Autotools.yml b/.github/workflows/macOS-Autotools.yml index 9ab3ebf7d3..c36cf323a7 100644 --- a/.github/workflows/macOS-Autotools.yml +++ b/.github/workflows/macOS-Autotools.yml @@ -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 @@ -31,15 +33,17 @@ jobs: 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 diff --git a/.github/workflows/macOS-Makefile.yml b/.github/workflows/macOS-Makefile.yml index a3c56f9d94..21f71235d6 100644 --- a/.github/workflows/macOS-Makefile.yml +++ b/.github/workflows/macOS-Makefile.yml @@ -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 @@ -79,15 +81,17 @@ jobs: 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