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

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

Author: manx
Date: Sat Oct  3 23:47:53 2026
New Revision: 25751
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=25751

Log:
Merged revision(s) 25741 from trunk/OpenMPT:
[Fix] build: CI: Github: macOS: Fix Homebrew OpenSSL 3 breakage on macOS 15.
........

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	Sat Oct  3 23:47:28 2026	(r25750)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Sat Oct  3 23:47:53 2026	(r25751)
@@ -35,9 +35,9 @@
       run: brew update
     - name: fixup Homebrew xcodes
       run: brew pin xcodes
-    - name: fixup GitHub Homebrew ruby breakage
-      if: ${{ matrix.host == 'macos-14' }}
-      run: brew unlink ruby@3.3 && brew link --overwrite ruby@3.3 && brew unlink ruby@3.3 && brew upgrade ruby@3.3
+    - name: fixup GitHub Homebrew openssl breakage
+      if: ${{ matrix.host == 'macos-15' }}
+      run: brew unlink openssl@3 && brew link --overwrite openssl@3 && brew unlink openssl@3 && brew upgrade openssl@3
     - name: fixup GitHub Homebrew ruby breakage
       if: ${{ matrix.host == 'macos-15' }}
       run: brew unlink ruby@3.3 && brew link --overwrite ruby@3.3 && brew unlink ruby@3.3 && brew upgrade ruby@3.3

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Sat Oct  3 23:47:28 2026	(r25750)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Sat Oct  3 23:47:53 2026	(r25751)
@@ -276,9 +276,9 @@
       run: brew update
     - name: fixup Homebrew xcodes
       run: brew pin xcodes
-    - name: fixup GitHub Homebrew ruby breakage
-      if: ${{ matrix.host == 'macos-14' }}
-      run: brew unlink ruby@3.3 && brew link --overwrite ruby@3.3 && brew unlink ruby@3.3 && brew upgrade ruby@3.3
+    - name: fixup GitHub Homebrew openssl breakage
+      if: ${{ matrix.host == 'macos-15' }}
+      run: brew unlink openssl@3 && brew link --overwrite openssl@3 && brew unlink openssl@3 && brew upgrade openssl@3
     - name: fixup GitHub Homebrew ruby breakage
       if: ${{ matrix.host == 'macos-15' }}
       run: brew unlink ruby@3.3 && brew link --overwrite ruby@3.3 && brew unlink ruby@3.3 && brew upgrade ruby@3.3