mirror of
https://github.com/ihhub/fheroes2.git
synced 2026-10-12 02:16:11 +00:00
Change to macos-26-intel runner (#10987)
This will be deprecated in August 2027. See https://github.com/actions/runner-images/pull/13634 and https://github.com/actions/runner-images/issues/13045 Not sure at what point they decided to add a macos-26-intel runner but it's there.
This commit is contained in:
@@ -103,7 +103,7 @@ jobs:
|
||||
FHEROES2_WITH_TSAN: ON
|
||||
- name: macOS SDL2
|
||||
on: [ 'pull_request', 'push' ]
|
||||
os: macos-14
|
||||
os: macos-26-intel
|
||||
arch: x86_64
|
||||
dependencies: sdl2 sdl2_mixer sdl2_image
|
||||
env:
|
||||
@@ -165,11 +165,6 @@ jobs:
|
||||
- name: Install dependencies (macOS)
|
||||
if: ${{ contains( matrix.on, github.event_name ) && startsWith( matrix.os, 'macos-' ) }}
|
||||
run: |
|
||||
if [[ "${{ matrix.arch }}" == x86_64 ]]; then
|
||||
arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||
# Homebrew uses /opt/homebrew for Apple Silicon packages and /usr/local for x86_64 packages
|
||||
export PATH=/usr/local/bin:$PATH
|
||||
fi
|
||||
brew install ${{ matrix.dependencies }}
|
||||
env:
|
||||
# Do not update outdated dependencies of installed packages
|
||||
@@ -182,10 +177,6 @@ jobs:
|
||||
- name: Build (MacOS)
|
||||
if: ${{ contains( matrix.on, github.event_name ) && startsWith( matrix.os, 'macos-' ) }}
|
||||
run: |
|
||||
if [[ "${{ matrix.arch }}" == x86_64 ]]; then
|
||||
# Homebrew uses /opt/homebrew for Apple Silicon packages and /usr/local for x86_64 packages
|
||||
export PATH=/usr/local/bin:$PATH
|
||||
fi
|
||||
make -j "$(sysctl -n hw.logicalcpu)"
|
||||
env: ${{ matrix.env }}
|
||||
- name: Create packages
|
||||
|
||||
Reference in New Issue
Block a user