[OMPT-svn-commit] OpenMPT r22324 - in branches/OpenMPT-1.31: . .github/workflows

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

Author: manx
Date: Wed Nov 27 15:00:28 2024
New Revision: 22324
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22324

Log:
Merged revision(s) 22319, 22323 from trunk/OpenMPT:
[Fix] build: CI: GitHub: macOS: Try to work-around Homebrew python breakage on macOS 13.
........
[Fix] build: CI: GitHub: macOS: Remove work-around for Homebrew unxip breakage on macOS 13.
........

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	Wed Nov 27 14:59:55 2024	(r22323)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Wed Nov 27 15:00:28 2024	(r22324)
@@ -26,12 +26,9 @@
     - uses: actions/checkout@v4
     - name: update Homebrew
       run: brew update
-    - name: fixup GitHub Homebrew unxip breakage
-      if: ${{ matrix.host == 'macos-13' }}
-      run: brew pin unxip
     - name: fixup GitHub Homebrew python breakage
       if: ${{ 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
+      run: brew unlink python@3.12 && brew link --overwrite python@3.12
     - name: upgrade packages
       run: brew upgrade
     - name: install dependencies

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Wed Nov 27 14:59:55 2024	(r22323)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Wed Nov 27 15:00:28 2024	(r22324)
@@ -101,12 +101,9 @@
     - uses: actions/checkout@v4
     - name: update Homebrew
       run: brew update
-    - name: fixup GitHub Homebrew unxip breakage
-      if: ${{ matrix.host == 'macos-13' }}
-      run: brew pin unxip
     - name: fixup GitHub Homebrew python breakage
       if: ${{ 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
+      run: brew unlink python@3.12 && brew link --overwrite python@3.12
     - name: upgrade packages
       run: brew upgrade
     - name: install dependencies