[OMPT-svn-commit] OpenMPT r21622 - in branches/OpenMPT-1.29: . .github/workflows

[<sv...@op...>]

Author: manx
Date: Thu Sep 19 15:05:31 2024
New Revision: 21622
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21622

Log:
Merged revision(s) 21621 from branches/OpenMPT-1.30:
[Fix] build: CI: GitHub: macOS: Fix GitHub Homebrew screwup on macOS 12. See r21619.
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml
   branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml

Modified: branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml	Thu Sep 19 15:05:10 2024	(r21621)
+++ branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml	Thu Sep 19 15:05:31 2024	(r21622)
@@ -15,18 +15,22 @@
 
     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 go@1.21
+      run: brew unlink go@1.21 && 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 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-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

Modified: branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml	Thu Sep 19 15:05:10 2024	(r21621)
+++ branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml	Thu Sep 19 15:05:31 2024	(r21622)
@@ -15,10 +15,14 @@
 
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew python breakage
       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-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