From: <sv...@op...> - 2024-08-12 19:22:06
|
Author: manx Date: Mon Aug 12 21:21:50 2024 New Revision: 21404 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21404 Log: Revert r21402. Merged revision(s) 21402 from trunk/OpenMPT: [Imp] build: CI: GitHub: macOS: Add arm64e builders. ........ Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Mon Aug 12 21:04:56 2024 (r21403) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Mon Aug 12 21:21:50 2024 (r21404) @@ -14,44 +14,32 @@ matrix: include: - { host: macos-14, compiler: '16.0', arch: '' , target: '' , deps: sys , check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64e, target: '' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: arm64 , target: '' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: x86_64, target: '' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64e, target: '' , deps: small, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: arm64 , target: '' , deps: small, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: x86_64, target: '' , deps: small, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64e, target: '14' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: x86_64, target: '14' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64e, target: '13' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: x86_64, target: '13' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64e, target: '12' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: x86_64, target: '12' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16.0', arch: arm64e, target: '11' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: x86_64, target: '11' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.0', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: '' , target: '' , deps: sys , check: true , ancient: false } - - { host: macos-14, compiler: '15.4', arch: arm64e, target: '' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: arm64 , target: '' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: x86_64, target: '' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '15.4', arch: arm64e, target: '' , deps: small, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: arm64 , target: '' , deps: small, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: x86_64, target: '' , deps: small, check: true , ancient: false } - - { host: macos-14, compiler: '15.4', arch: arm64e, target: '14' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: arm64 , target: '14' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: x86_64, target: '14' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '15.4', arch: arm64e, target: '13' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: arm64 , target: '13' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: x86_64, target: '13' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '15.4', arch: arm64e, target: '12' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: arm64 , target: '12' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: x86_64, target: '12' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '15.4', arch: arm64e, target: '11' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: arm64 , target: '11' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: x86_64, target: '11' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } |