From c546830f938ffa439d624820f4fb2b22987b4da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Thu, 26 Sep 2024 06:12:04 +0000 Subject: [PATCH] Revert r21749 because of GitHub/Homebrew breakage. Merged revision(s) 21749 from trunk/OpenMPT: [Mod] build: CI: GitHub: macOS: Run XCode 16 and 16.1 on macOS 15 instead of macOS 14. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@21752 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- .github/workflows/macOS-Autotools.yml | 4 +- .github/workflows/macOS-Makefile.yml | 64 +++++++++++++-------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/macOS-Autotools.yml b/.github/workflows/macOS-Autotools.yml index c668b0d43a..6fa55e8ce3 100644 --- a/.github/workflows/macOS-Autotools.yml +++ b/.github/workflows/macOS-Autotools.yml @@ -12,8 +12,8 @@ jobs: fail-fast: false matrix: include: - - { host: macos-15, compiler: '16.1' } - - { host: macos-15, compiler: '16' } + - { host: macos-14, compiler: '16.1' } + - { host: macos-14, compiler: '16' } - { 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 0df9389666..621afe83dd 100644 --- a/.github/workflows/macOS-Makefile.yml +++ b/.github/workflows/macOS-Makefile.yml @@ -13,38 +13,38 @@ jobs: fail-fast: false matrix: include: - - { host: macos-15, compiler: '16.1', arch: '' , target: '' , deps: sys , check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: arm64 , target: '' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: x86_64, target: '' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: arm64 , target: '' , deps: small, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: x86_64, target: '' , deps: small, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: arm64 , target: '14' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: x86_64, target: '14' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: arm64 , target: '13' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: x86_64, target: '13' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: arm64 , target: '12' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: x86_64, target: '12' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: arm64 , target: '11' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: x86_64, target: '11' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16.1', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: '' , target: '' , deps: sys , check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: arm64 , target: '' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: x86_64, target: '' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: arm64 , target: '' , deps: small, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: x86_64, target: '' , deps: small, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: arm64 , target: '14' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: x86_64, target: '14' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: arm64 , target: '13' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: x86_64, target: '13' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: arm64 , target: '12' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: x86_64, target: '12' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: arm64 , target: '11' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: x86_64, target: '11' , deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: x86_64, target: '10.15', deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: x86_64, target: '10.14', deps: local, check: true , ancient: false } - - { host: macos-15, compiler: '16' , arch: x86_64, target: '10.13', deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: '' , target: '' , deps: sys , check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '' , deps: small, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '' , deps: small, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '14' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '14' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '13' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '13' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '12' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '12' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: arm64 , target: '11' , deps: local, check: true , ancient: false } + - { host: macos-14, compiler: '16.1', arch: x86_64, target: '11' , deps: local, check: true , ancient: false } + - { 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: '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 }