From 36230e350046e36574734b1153d6f5d21520884f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Tue, 15 Oct 2024 18:05:41 +0000 Subject: [PATCH] Merged revision(s) 21820 from trunk/OpenMPT: [Ref] build: CI: GitHub: macOS: GitHub now allows referencing XCode 16.0 as "16.0" instead of ambiguous "16". ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@21822 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- .github/workflows/macOS-Autotools.yml | 2 +- .github/workflows/macOS-Makefile.yml | 32 +++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/macOS-Autotools.yml b/.github/workflows/macOS-Autotools.yml index 76afeaceb75..772cdb38941 100644 --- a/.github/workflows/macOS-Autotools.yml +++ b/.github/workflows/macOS-Autotools.yml @@ -11,7 +11,7 @@ jobs: matrix: include: - { host: macos-14, compiler: '16.1' } - - { host: macos-14, compiler: '16' } + - { host: macos-14, compiler: '16.0' } - { host: macos-14, compiler: '15.4' } - { host: macos-14, compiler: '15.3' } - { host: macos-13, compiler: '15.2' } diff --git a/.github/workflows/macOS-Makefile.yml b/.github/workflows/macOS-Makefile.yml index 08550ea556f..c746a70d67a 100644 --- a/.github/workflows/macOS-Makefile.yml +++ b/.github/workflows/macOS-Makefile.yml @@ -27,22 +27,22 @@ jobs: - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false } - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: '' , target: '' , deps: sys , check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: arm64 , target: '' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: x86_64, target: '' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: arm64 , target: '' , deps: small, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: x86_64, target: '' , deps: small, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: arm64 , target: '14' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: x86_64, target: '14' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: arm64 , target: '13' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: x86_64, target: '13' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: arm64 , target: '12' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: x86_64, target: '12' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: arm64 , target: '11' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: x86_64, target: '11' , deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: x86_64, target: '10.14', deps: local, check: true , ancient: false } - - { host: macos-14, compiler: '16' , arch: x86_64, target: '10.13', deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.0', arch: '' , target: '' , deps: sys , 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: 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: 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: 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: 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: 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: arm64 , target: '' , deps: local, check: true , ancient: false } - { host: macos-14, compiler: '15.4', arch: x86_64, target: '' , deps: local, check: true , ancient: false }