Author: manx
Date: Fri Mar 8 13:45:11 2024
New Revision: 20279
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20279
Log:
Merged revision(s) 20256, 20260-20261, 20270 from trunk/OpenMPT:
[New] build: CI: GitHub: Add macOS 14 runner.
........
[Imp] build: CI: GitHub: macOS: Use a big matrix build with explicit host system, Xcode version, architecture, and deployment target.
........
[Fix] build: Makefile: macOS: Fix typo.
........
[Imp] build: CI: GitHub: macOS: Add builds with small dependencies.
........
Added:
branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
- copied, changed from r20261, trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
Deleted:
branches/OpenMPT-1.31/.github/workflows/macOS-12-Makefile.yml
branches/OpenMPT-1.31/.github/workflows/macOS-13-Makefile.yml
Modified:
branches/OpenMPT-1.31/ (props changed)
Copied and modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml (from r20261, trunk/OpenMPT/.github/workflows/macOS-Makefile.yml)
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Thu Mar 7 09:44:47 2024 (r20261, copy source)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Fri Mar 8 13:45:11 2024 (r20279)
@@ -3,37 +3,39 @@
on:
push:
- branches: [ master ]
- pull_request:
- branches: [ master ]
+ branches: [ OpenMPT-1.31 ]
jobs:
build:
strategy:
matrix:
include:
- - { host: macos-14, compiler: 15.2, arch: '' , target: '' , deps: true, check: true }
- - { host: macos-14, compiler: 15.2, arch: arm64 , target: '' , deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: x64_64, target: '' , deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: arm64 , target: 14 , deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: x64_64, target: 14 , deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: arm64 , target: 13 , deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: x64_64, target: 13 , deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: arm64 , target: 12 , deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: x64_64, target: 12 , deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: arm64 , target: 11 , deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: x64_64, target: 11 , deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.15, deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.14, deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: i386 , target: 10.14, deps: false, check: false }
- - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.13, deps: false, check: true }
- - { host: macos-14, compiler: 15.2, arch: i386 , target: 10.13, deps: false, check: false }
- - { host: macos-13, compiler: 15.2, arch: x64_64, target: 10.13, deps: false, check: true }
- - { host: macos-13, compiler: 15.2, arch: i386 , target: 10.13, deps: false, check: false }
- - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: false, check: true }
- - { host: macos-12, compiler: 14.2, arch: i386 , target: 10.13, deps: false, check: false }
+ - { host: macos-14, compiler: 15.2, arch: '' , target: '' , deps: sys, check: true }
+ - { host: macos-14, compiler: 15.2, arch: arm64 , target: '' , deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: x64_64, target: '' , deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: arm64 , target: '' , deps: small, check: true }
+ - { host: macos-14, compiler: 15.2, arch: x64_64, target: '' , deps: small, check: true }
+ - { host: macos-14, compiler: 15.2, arch: arm64 , target: 14 , deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: x64_64, target: 14 , deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: arm64 , target: 13 , deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: x64_64, target: 13 , deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: arm64 , target: 12 , deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: x64_64, target: 12 , deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: arm64 , target: 11 , deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: x64_64, target: 11 , deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.15, deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.14, deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: i386 , target: 10.14, deps: local, check: false }
+ - { host: macos-14, compiler: 15.2, arch: x64_64, target: 10.13, deps: local, check: true }
+ - { host: macos-14, compiler: 15.2, arch: i386 , target: 10.13, deps: local, check: false }
+ - { host: macos-13, compiler: 15.2, arch: x64_64, target: 10.13, deps: local, check: true }
+ - { host: macos-13, compiler: 15.2, arch: i386 , target: 10.13, deps: local, check: false }
+ - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: local, check: true }
+ - { host: macos-12, compiler: 14.2, arch: i386 , target: 10.13, deps: local, check: false }
+ - { host: macos-12, compiler: 14.2, arch: x64_64, target: 10.13, deps: small, check: true }
+ - { host: macos-12, compiler: 14.2, arch: i386 , target: 10.13, deps: small, check: false }
concurrency:
- group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}
+ group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
cancel-in-progress: true
runs-on: ${{matrix.host}}
steps:
@@ -51,7 +53,7 @@
- name: setup parallel make
run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
- name: make
- run: make ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('MACOSX_VERSION_MIN=',matrix.target) }} STRICT=1 ${{ matrix.deps && 'FORCE_DEPS=1' || 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
+ run: make ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('MACOSX_VERSION_MIN=',matrix.target) }} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
- name: make check
if: ${{ matrix.check }}
- run: make ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('MACOSX_VERSION_MIN=',matrix.target) }} STRICT=1 ${{ matrix.deps && 'FORCE_DEPS=1' || 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
+ run: make ${{ matrix.arch == '' && '' || join('ARCH=',matrix.arch) }} ${{ matrix.target == '' && '' || join('MACOSX_VERSION_MIN=',matrix.target) }} STRICT=1 ${{ (matrix.deps == 'sys') && 'FORCE_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
|
