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

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

Author: manx
Date: Wed Jul 31 14:38:00 2024
New Revision: 21316
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21316

Log:
Merged revision(s) 21311-21313 from trunk/OpenMPT:
[New] build: CI: GitHub: macOS: Add Autotools builder.
........
[Fix] build: CI: GitHub: macOS: Install Autoconf and Automake.
........
[Fix] build: CI: GitHub: macOS: Install libtool.
........

Added:
   branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml
      - copied, changed from r21313, trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml

Copied and modified: branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml (from r21313, trunk/OpenMPT/.github/workflows/macOS-Autotools.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Wed Jul 31 11:54:14 2024	(r21313, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Wed Jul 31 14:38:00 2024	(r21316)
@@ -2,9 +2,7 @@
 
 on:
   push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    branches: [ OpenMPT-1.31 ]
 
 jobs:
   build:

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Wed Jul 31 14:37:07 2024	(r21315)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Wed Jul 31 14:38:00 2024	(r21316)
@@ -53,7 +53,7 @@
       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: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
+      run: brew update && brew upgrade && 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