From a0a28c01fa567f43a956609c4441b395e531bb98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Wed, 18 Sep 2024 09:48:01 +0000 Subject: [PATCH] Merged revision(s) 21598-21599 from trunk/OpenMPT: [Fix] build: CI: GitHub: macOS: Try to fix GitHub homebrew go breakage on macOS 12. ........ [Fix] build: CI: GitHub: macOS: Try to fix GitHub homebrew go breakage on macOS 12. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@21603 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- .github/workflows/macOS-Autotools.yml | 3 +++ .github/workflows/macOS-Makefile.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/macOS-Autotools.yml b/.github/workflows/macOS-Autotools.yml index d176809bcaf..9ab3ebf7d3f 100644 --- a/.github/workflows/macOS-Autotools.yml +++ b/.github/workflows/macOS-Autotools.yml @@ -29,6 +29,9 @@ jobs: - name: fixup GitHub Homebrew xcbeautify breakage if: ${{ matrix.host == 'macos-12' }} run: brew pin xcbeautify + - name: fixup GitHub Homebrew go breakage + if: ${{ matrix.host == 'macos-12' }} + run: brew unlink go@1.21 - name: fixup GitHub Homebrew node breakage if: ${{ matrix.host == 'macos-12' }} run: brew unlink node@18 && brew unlink node && brew link --overwrite node diff --git a/.github/workflows/macOS-Makefile.yml b/.github/workflows/macOS-Makefile.yml index cff64d0c8dd..a3c56f9d94b 100644 --- a/.github/workflows/macOS-Makefile.yml +++ b/.github/workflows/macOS-Makefile.yml @@ -77,6 +77,9 @@ jobs: - name: fixup GitHub Homebrew xcbeautify breakage if: ${{ matrix.host == 'macos-12' }} run: brew pin xcbeautify + - name: fixup GitHub Homebrew go breakage + if: ${{ matrix.host == 'macos-12' }} + run: brew unlink go@1.21 - name: fixup GitHub Homebrew node breakage if: ${{ matrix.host == 'macos-12' }} run: brew unlink node@18 && brew unlink node && brew link --overwrite node