Merged revision(s) 21845 from trunk/OpenMPT:

[Reg] build: CI: GitHub: macOS: Remove macOS 12 because it is being phased out on GitHub. [Reg] build: CI: GitHub: macOS: Remove XCode 13.2 because it is only supported on macOS 12. [New] build: CI: GitHub: macOS: Add XCode 14.1 on macOS 13. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@21846 56274372-70c3-4bfc-bfc3-4c3a0b034d27
OpenMPT · Oct 16, 2024 · 49d84cd · 49d84cd
1 parent 1394441
commit 49d84cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 38 deletions.
diff --git a/.github/workflows/macOS-Autotools.yml b/.github/workflows/macOS-Autotools.yml
@@ -15,8 +15,8 @@ jobs:
  - { host: macos-14, compiler: '15.4' }
  - { host: macos-14, compiler: '15.3' }
  - { host: macos-13, compiler: '15.2' }
- - { host: macos-12, compiler: '14.2' }
- - { host: macos-12, compiler: '13.2' }
+ - { host: macos-13, compiler: '14.2' }
+ - { host: macos-13, compiler: '14.1' }
  concurrency:
  group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-autotools
  cancel-in-progress: true
@@ -25,24 +25,9 @@ jobs:
  - uses: actions/checkout@v4
  - name: update Homebrew
  run: brew update
- - name: fixup GitHub Homebrew swiftlint breakage
- if: ${{ matrix.host == 'macos-12' }}
- run: brew pin swiftlint
- - name: fixup GitHub Homebrew xcbeautify breakage
- if: ${{ matrix.host == 'macos-12' }}
- run: brew pin xcbeautify
- - name: fixup GitHub Homebrew go breakage
- if: ${{ matrix.host == 'macos-12' }}
- run: brew unlink go@1.21 && brew unlink go && brew link --overwrite go
- - name: fixup GitHub Homebrew node breakage
- if: ${{ matrix.host == 'macos-12' }}
- run: brew unlink node@18 && brew unlink node && brew link --overwrite node
  - name: fixup GitHub Homebrew python breakage
- if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
+ if: ${{ 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: upgrade packages
- if: ${{ matrix.host != 'macos-12' }}
- run: brew upgrade
  - name: install dependencies
  run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
  - name: selecting Xcode version

diff --git a/.github/workflows/macOS-Makefile.yml b/.github/workflows/macOS-Makefile.yml
@@ -67,10 +67,10 @@ jobs:
  - { host: macos-14, compiler: '15.4', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
  - { host: macos-14, compiler: '15.3', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
  - { host: macos-13, compiler: '15.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
- - { host: macos-12, compiler: '14.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
- - { host: macos-12, compiler: '14.2', arch: x86_64, target: '10.13', deps: small, check: true , ancient: false }
- - { host: macos-12, compiler: '13.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: true  }
- - { host: macos-12, compiler: '13.2', arch: x86_64, target: '10.13', deps: small, check: true , ancient: true  }
+ - { host: macos-13, compiler: '14.2', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+ - { host: macos-13, compiler: '14.2', arch: x86_64, target: '10.13', deps: small, check: true , ancient: false }
+ - { host: macos-13, compiler: '14.1', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+ - { host: macos-13, compiler: '14.1', arch: x86_64, target: '10.13', deps: small, check: true , ancient: false }
  concurrency:
  group: ${{github.ref}}-${{github.workflow}}-${{matrix.host}}-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.target}}-${{matrix.deps}}
  cancel-in-progress: true
@@ -79,24 +79,9 @@ jobs:
  - uses: actions/checkout@v4
  - name: update Homebrew
  run: brew update
- - name: fixup GitHub Homebrew swiftlint breakage
- if: ${{ matrix.host == 'macos-12' }}
- run: brew pin swiftlint
- - name: fixup GitHub Homebrew xcbeautify breakage
- if: ${{ matrix.host == 'macos-12' }}
- run: brew pin xcbeautify
- - name: fixup GitHub Homebrew go breakage
- if: ${{ matrix.host == 'macos-12' }}
- run: brew unlink go@1.21 && brew unlink go && brew link --overwrite go
- - name: fixup GitHub Homebrew node breakage
- if: ${{ matrix.host == 'macos-12' }}
- run: brew unlink node@18 && brew unlink node && brew link --overwrite node
  - name: fixup GitHub Homebrew python breakage
- if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
+ if: ${{ 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: upgrade packages
- if: ${{ matrix.host != 'macos-12' }}
- run: brew upgrade
  - name: install dependencies
  run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
  - name: selecting Xcode version